Merge lp:~elopio/snapcraft/patcher into lp:~sergiusens/snapcraft/meta-all-yaml

[Leo Arias]

Use patcher start and stop on cleanup.

[Sergio Schvezov (sergiusens)]

Approve

I don't know what I did wrong, but yay!

On Wed, Aug 26, 2015 at 1:08 PM, Leo Arias <email address hidden> wrote:

> Leo Arias has proposed merging lp:~elopio/snapcraft/patcher into
> lp:~sergiusens/snapcraft/meta-all-yaml.
>
> Commit message:
> Use patcher start and stop on cleanup.
>
> Requested reviews:
> Sergio Schvezov (sergiusens)
>
> For more details, see:
> https://code.launchpad.net/~elopio/snapcraft/patcher/+merge/269239
> --
> You are requested to review the proposed merge of
> lp:~elopio/snapcraft/patcher into lp:~sergiusens/snapcraft/meta-all-yaml.
>
> Launchpad-Message-Rationale: Reviewer
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~elopio/snapcraft/patcher
> Launchpad-Project: snapcraft
>
> === modified file 'snapcraft/tests/test_meta.py'
> --- snapcraft/tests/test_meta.py 2015-08-26 12:11:33 +0000
> +++ snapcraft/tests/test_meta.py 2015-08-26 16:07:08 +0000
> @@ -33,8 +33,10 @@
>
> def setUp(self):
> super().setUp()
> - self.orig_wrap_exe = meta._wrap_exe
> - meta._wrap_exe = Mock(return_value='binary.wrapped')
> + patcher = patch('snapcraft.meta._wrap_exe')
> + mock_wrap_exe = patcher.start()
> + mock_wrap_exe.return_value = 'binary.wrapped'
> + self.addCleanup(patcher.stop)
>
> self.config_data = {
> 'name': 'my-package',
> @@ -42,10 +44,6 @@
> 'vendor': 'Sergio Schvezov <email address hidden>',
> }
>
> - def tearDown(self):
> - super().tearDown()
> - meta._wrap_exe = self.orig_wrap_exe
> -
> def test_plain_no_binaries_or_services(self):
>
> y = meta._compose_package_yaml(self.config_data, ['armhf',
> 'amd64'])
>
>
>

=== modified file 'snapcraft/tests/test_meta.py'
--- snapcraft/tests/test_meta.py	2015-08-26 12:11:33 +0000
+++ snapcraft/tests/test_meta.py	2015-08-26 16:07:08 +0000
@@ -33,8 +33,10 @@
 
     def setUp(self):
         super().setUp()
-        self.orig_wrap_exe = meta._wrap_exe
-        meta._wrap_exe = Mock(return_value='binary.wrapped')
+        patcher = patch('snapcraft.meta._wrap_exe')
+        mock_wrap_exe = patcher.start()
+        mock_wrap_exe.return_value = 'binary.wrapped'
+        self.addCleanup(patcher.stop)
 
         self.config_data = {
             'name': 'my-package',
@@ -42,10 +44,6 @@
             'vendor': 'Sergio Schvezov <[e-mail]>',
         }
 
-    def tearDown(self):
-        super().tearDown()
-        meta._wrap_exe = self.orig_wrap_exe
-
     def test_plain_no_binaries_or_services(self):
 
         y = meta._compose_package_yaml(self.config_data, ['armhf', 'amd64'])