Merge lp:~rockstar/launchpad/create-recipe-error-messages into lp:launchpad

[Paul Hummer]

This branch is a very small fix to pass the bzr-builder exception on to the user when creating a source package recipe. It's bug #604725. I had to change the test a bit so that I could actually construct a real recipe. In fact, since I was sitting next to thumper at the time he found this bug (we knew it existed, but hadn't encountered it yet), I made the test very specific to his exact use case.

I _think_ this test will need to be changed when we update bzr-builder next, because James made some other changes to the exceptions in bzr-builder recently.

[Jonathan Lange (jml)]

On Mon, Jul 19, 2010 at 12:41 PM, Paul Hummer <email address hidden> wrote:
> Paul Hummer has proposed merging lp:~rockstar/launchpad/create-recipe-error-messages into lp:launchpad/devel.
>
> Requested reviews:
>  Jonathan Lange (jml): code
> Related bugs:
>  #604725 Parse errors creating recipe don't show the exception message
>  https://bugs.launchpad.net/bugs/604725
>
>
> This branch is a very small fix to pass the bzr-builder exception on to the user when creating a source package recipe.  It's bug #604725.  I had to change the test a bit so that I could actually construct a real recipe.  In fact, since I was sitting next to thumper at the time he found this bug (we knew it existed, but hadn't encountered it yet), I made the test very specific to his exact use case.

Hey Paul,

This branch looks great. Only one question:

...
> === modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
> --- lib/lp/code/browser/tests/test_sourcepackagerecipe.py       2010-07-13 10:28:38 +0000
> +++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py       2010-07-19 10:41:11 +0000
> @@ -192,10 +192,26 @@
>     def test_create_recipe_bad_text(self):
>         # If a user tries to create source package recipe with bad text, they
>         # should get an error.
> -        browser = self.createRecipe('Foo bar baz')
> +        product = self.factory.makeProduct(
> +            name='ratatouille', displayname='Ratatouille')
> +        branch = self.factory.makeBranch(
> +            owner=self.chef, product=product, name='veggies')
> +        package_branch = self.factory.makeBranch(
> +            owner=self.chef, product=product, name='packaging')
> +

Why is the common product, branch name and branch owner relevant?

Why not:
    branch = self.factory.makeBranch()
    package_branch = self.factory.makeBranch()
?

jml

[Jonathan Lange (jml)]

See above.

review: Approve (code)

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-07-13 10:28:38 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-07-19 10:55:04 +0000
@@ -294,10 +294,11 @@
         try:
             parser = RecipeParser(data['recipe_text'])
             parser.parse()
-        except RecipeParseError:
+        except RecipeParseError, error:
             self.setFieldError(
                 'recipe_text',
-                'The recipe text is not a valid bzr-builder recipe.')
+                'The recipe text is not a valid bzr-builder recipe.  '
+                '%(error)s' % {'error': error.problem})
 
 
 class SourcePackageRecipeAddView(RecipeTextValidatorMixin, LaunchpadFormView):

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-07-13 10:28:38 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-07-19 10:55:04 +0000
@@ -192,10 +192,22 @@
     def test_create_recipe_bad_text(self):
         # If a user tries to create source package recipe with bad text, they
         # should get an error.
-        browser = self.createRecipe('Foo bar baz')
+        branch = self.factory.makeBranch(name='veggies')
+        package_branch = self.factory.makeBranch(name='packaging')
+
+        browser = self.createRecipe(
+            dedent('''
+                # bzr-builder format 0.2 deb-version 0+{revno}
+                %(branch)s
+                merge %(package_branch)s
+                ''' % {
+                    'branch': branch.bzr_identity,
+                    'package_branch': package_branch.bzr_identity,}),
+            branch=branch)
         self.assertEqual(
             get_message_text(browser, 2),
-            'The recipe text is not a valid bzr-builder recipe.')
+            "The recipe text is not a valid bzr-builder recipe. "
+            "End of line while looking for '#'")
 
     def test_create_recipe_no_distroseries(self):
         browser = self.getViewBrowser(self.makeBranch(), '+new-recipe')