1441484 - NameError in make_incremental_updates.py "global name 'exc' is not defined"

Status: RESOLVED FIXED

(Release Engineering :: Release Automation: Other, defect)

Description

[Julien Cristau [:jcristau]]

In bug 1385780, "except Exception, exc" was replaced by "except Exception(exc)" instead of "except Exception as exc".

Comment 1

[Julien Cristau [:jcristau]]

Attachment: Bug 1441484 - fix error handling in make_incremental_updates.

Review commit: https://reviewboard.mozilla.org/r/223428/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/223428/

Comment 2

[[e-mail] (:bhearsum)]

Comment on attachment 8954306 [details]
Bug 1441484 - fix error handling in make_incremental_updates.

https://reviewboard.mozilla.org/r/223428/#review229548

::: tools/update-packaging/test_make_incremental_updates.py:149
(Diff revision 1)
>  
>      def test_decode_filename(self):
>          expected = {'locale': 'lang', 'platform': 'platform', 'product': 'product', 'version': '1.0', 'type': 'complete'}
>          self.assertEquals(expected, mkup.decode_filename('product-1.0.lang.platform.complete.mar'))
>          self.assertRaises(Exception, mkup.decode_filename, 'fail')
> +        self.assertEquals(expected, mkup.decode_filename('platform/lang/product-1.0.complete.mar'))

The other way to make this test catch it is to raise a better exception and/or catch a more specific error message. This is fine though - thank you!

Comment 3

[Julien Cristau [:jcristau]]

Comment on attachment 8954306 [details]
Bug 1441484 - fix error handling in make_incremental_updates.

https://reviewboard.mozilla.org/r/223428/#review229548

> The other way to make this test catch it is to raise a better exception and/or catch a more specific error message. This is fine though - thank you!

I actually wrote this initially:

-        self.assertRaises(Exception, mkup.decode_filename, 'fail')
+        with self.assertRaises(Exception) as cm:
+            mkup.decode_filename('fail')
+        self.assertTrue(cm.exception.args[0].startswith('could not parse filepath fail:'))

Wasn't sure if it was worth it, but I can pull that back in.

Comment 4

[Julien Cristau [:jcristau]]

Comment on attachment 8954306 [details]
Bug 1441484 - fix error handling in make_incremental_updates.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/223428/diff/1-2/

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/179c83a1d28b
fix error handling in make_incremental_updates.  r=bhearsum

Comment 6

[Noemi Erli[:noemi_erli]]

https://hg.mozilla.org/mozilla-central/rev/179c83a1d28b