gryf/fs-uae-wrapper
1
0 Fork 0
mirror of https://github.com/gryf/fs-uae-wrapper.git synced 2026-10-08 21:52:30 +02:00
Code Issues Projects Releases Wiki Activity

Added wrapper_archiver option

Browse Source 
To give user a possibility to choose what archiver he can use another
options was introduced for cd32 and archive wrapper modules. This option
will indicate what archiver should be used for compressing the save
state directories.
This commit is contained in:
gryf committed 2017-01-02 20:08:50 +01:00
1 parent 5f98e9b794
commit 19acb789b6
6 files changed
+82 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/test_base.py
+20 -5
View File
@@ -75,13 +75,15 @@ class TestBase(TestCase):
bobj = base.Base('Config.fs-uae', utils.CmdOption(), {})
os.chdir(self.dirname)
bobj.conf_file = 'Config.fs-uae'
bobj.all_options = {'wrapper_archive': 'foo.7z'}
bobj.all_options = {'wrapper_archive': 'foo.7z',
'wrapper_archiver': '7z'}
bobj._set_assets_paths()
full_path = os.path.join(self.dirname, 'Config_save.7z')
self.assertEqual(bobj.save_filename, full_path)
bobj.all_options = {'wrapper_archive': '/home/user/foo.7z'}
bobj.all_options = {'wrapper_archive': '/home/user/foo.7z',
'wrapper_archiver': '7z'}
bobj._set_assets_paths()
full_path = os.path.join(self.dirname, 'Config_save.7z')
@@ -214,9 +216,12 @@ class TestBase(TestCase):
os.unlink(path)
os.mkdir(path)
self.assertEqual(bobj._get_saves_dir(), path)
self.assertEqual(bobj._get_saves_dir(), 'saves')
def test_validate_options(self):
@mock.patch('fs_uae_wrapper.path.which')
def test_validate_options(self, which):
which.return_value = None
bobj = base.Base('Config.fs-uae', utils.CmdOption(), {})
bobj.all_options = {}
@@ -224,6 +229,15 @@ class TestBase(TestCase):
self.assertFalse(bobj._validate_options())
bobj.all_options = {'wrapper': 'dummy'}
self.assertFalse(bobj._validate_options())
bobj.all_options = {'wrapper': 'dummy',
'wrapper_archiver': 'myarchiver'}
self.assertFalse(bobj._validate_options())
which.return_value = '7z'
bobj.all_options = {'wrapper': 'dummy',
'wrapper_archiver': '7z'}
self.assertTrue(bobj._validate_options())
def test_run_clean(self):
@@ -233,7 +247,8 @@ class TestBase(TestCase):
self.assertFalse(bobj.run())
bobj.all_options = {'wrapper': 'dummy'}
bobj.all_options = {'wrapper': 'dummy',
'wrapper_archiver': 'rar'}
try:
self.assertTrue(bobj.run())
self.assertTrue(os.path.exists(bobj.dir))
tests/test_cd32.py
+5 -1
View File
@@ -20,6 +20,9 @@ class TestCD32(TestCase):
self.assertFalse(acd32._validate_options())
acd32.all_options['wrapper_archive'] = 'fake.tgz'
self.assertFalse(acd32._validate_options())
acd32.all_options['wrapper_archiver'] = 'rar'
self.assertTrue(acd32._validate_options())
@mock.patch('tempfile.mkdtemp')
@@ -42,7 +45,8 @@ class TestCD32(TestCase):
self.assertFalse(acd32.run())
acd32.all_options = {'wrapper': 'cd32',
'wrapper_archive': 'fake.tgz'}
'wrapper_archive': 'fake.tgz',
'wrapper_archiver': 'rar'}
self.assertFalse(acd32.run())
tests/test_utils.py
+2 -2
View File
@@ -72,7 +72,7 @@ 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.path.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')
@@ -153,7 +153,7 @@ 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.path.which')
@mock.patch('fs_uae_wrapper.file_archive.Archive.extract')
def test_extract_archive_positive(self, arch_extract, which):
arch_extract.return_value = True