From 38a2322e98f0dfaccab5c6accf368ce7db4d28f5 Mon Sep 17 00:00:00 2001 From: gryf Date: Mon, 2 Jan 2017 16:05:18 +0100 Subject: [PATCH] Fix for file_archive tests --- setup.py | 2 +- tests/test_utils.py | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 0372c31..c2c3d22 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ from distutils.core import setup setup(name='fs-uae-wrapper', packages=['fs_uae_wrapper'], - version='0.3', + version='0.3.1', description='Automate archives and state for fs-uae', author='Roman Dobosz', author_email='gryf73@gmail.com', diff --git a/tests/test_utils.py b/tests/test_utils.py index 5124d06..bdd70e2 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -72,13 +72,15 @@ class TestUtils(TestCase): conf = utils.get_config_options(self.fname) self.assertDictEqual(conf, {'wrapper': ''}) + @mock.patch('fs_uae_wrapper.file_archive.which') @mock.patch('fs_uae_wrapper.file_archive.Archive.extract') @mock.patch('fs_uae_wrapper.file_archive.Archive.create') @mock.patch('fs_uae_wrapper.message.Message.close') @mock.patch('fs_uae_wrapper.message.Message.show') - def test_operate_archive(self, show, close, create, extract): + def test_operate_archive(self, show, close, create, extract, which): os.chdir(self.dirname) + which.return_value = None # No config self.assertFalse(utils.operate_archive('non-existend.7z', 'foo', '')) @@ -92,6 +94,7 @@ class TestUtils(TestCase): # archive is known, but extraction will fail - we have an empty # archive and there is no guarantee, that 7z exists on system where # test will run + which.return_value = '7z' extract.return_value = True with open('supported-archive.7z', 'w') as fobj: fobj.write("\n") @@ -129,7 +132,9 @@ class TestUtils(TestCase): fobj.write("\n") self.assertFalse(utils.extract_archive('supported-archive.7z')) - def test_create_archive(self): + @mock.patch('fs_uae_wrapper.file_archive.Archive.create') + def test_create_archive(self, arch_create): + arch_create.return_value = True os.chdir(self.dirname) @@ -148,8 +153,11 @@ class TestUtils(TestCase): fobj.write("\n") self.assertFalse(utils.extract_archive('supported-archive.7z')) + @mock.patch('fs_uae_wrapper.file_archive.which') @mock.patch('fs_uae_wrapper.file_archive.Archive.extract') - def test_extract_archive_positive(self, arch_extract): + def test_extract_archive_positive(self, arch_extract, which): + arch_extract.return_value = True + which.return_value = '7z' os.chdir(self.dirname) # archive is known, and extraction should succeed