1
0
mirror of https://github.com/gryf/fs-uae-wrapper.git synced 2025-12-29 01:42:27 +01:00

Added wrapper_save_state option

This commit is contained in:
2017-01-03 19:34:42 +01:00
parent 0b831e5b10
commit 0cbe6fc9d0
7 changed files with 111 additions and 66 deletions

View File

@@ -28,40 +28,40 @@ class TestArchive(TestCase):
@mock.patch('fs_uae_wrapper.path.which')
def test_validate_options(self, which):
which.return_value = None
which.return_value = 'unrar'
arch = archive.Archive('Config.fs-uae', utils.CmdOption(), {})
self.assertFalse(arch._validate_options())
arch.all_options = {'wrapper': 'archive'}
arch.all_options['wrapper'] = 'archive'
self.assertFalse(arch._validate_options())
arch.all_options['wrapper_archive'] = 'fake.tgz'
self.assertFalse(arch._validate_options())
arch.all_options['wrapper_archiver'] = 'rar'
self.assertFalse(arch._validate_options())
which.return_value = 'unrar'
arch.all_options['wrapper_archiver'] = 'rar'
arch.all_options['wrapper_archive'] = 'rar'
self.assertTrue(arch._validate_options())
@mock.patch('tempfile.mkdtemp')
@mock.patch('fs_uae_wrapper.path.which')
@mock.patch('fs_uae_wrapper.archive.Archive._make_archive')
@mock.patch('fs_uae_wrapper.base.Base._save_save')
@mock.patch('fs_uae_wrapper.base.Base._get_saves_dir')
@mock.patch('fs_uae_wrapper.base.Base._run_emulator')
@mock.patch('fs_uae_wrapper.base.Base._kickstart_option')
@mock.patch('fs_uae_wrapper.base.Base._copy_conf')
@mock.patch('fs_uae_wrapper.base.Base._load_save')
@mock.patch('fs_uae_wrapper.base.Base._extract')
def test_run(self, extr, load, copy, kick, run, march, which, mkdtemp):
def test_run(self, extract, load_save, copy_conf, kick_option,
run_emulator, get_save_dir, save_state, make_arch, which,
mkdtemp):
extr.return_value = False
load.return_value = False
copy.return_value = False
kick.return_value = False
run.return_value = False
march.return_value = False
extract.return_value = False
load_save.return_value = False
copy_conf.return_value = False
kick_option.return_value = False
run_emulator.return_value = False
get_save_dir.return_value = False
save_state.return_value = False
make_arch.return_value = False
which.return_value = 'rar'
arch = archive.Archive('Config.fs-uae', utils.CmdOption(), {})
@@ -73,23 +73,29 @@ class TestArchive(TestCase):
self.assertFalse(arch.run())
extr.return_value = True
extract.return_value = True
self.assertFalse(arch.run())
load.return_value = True
load_save.return_value = True
self.assertFalse(arch.run())
copy.return_value = True
copy_conf.return_value = True
self.assertFalse(arch.run())
kick.return_value = {'foo': 'bar'}
kick_option.return_value = {'foo': 'bar'}
self.assertFalse(arch.run())
self.assertDictEqual(arch.fsuae_options, {'foo': 'bar'})
run.return_value = True
run_emulator.return_value = True
self.assertFalse(arch.run())
march.return_value = True
get_save_dir.return_value = True
self.assertFalse(arch.run())
save_state.return_value = True
self.assertFalse(arch.run())
make_arch.return_value = True
self.assertTrue(arch.run())
@mock.patch('os.rename')

View File

@@ -155,14 +155,18 @@ class TestBase(TestCase):
saves_dir.return_value = None
carch.return_value = True
self.assertTrue(bobj._save_save())
self.assertTrue(bobj._save_save(),
'there is assumption, that wrapper_save_state is'
' false by default. Here it was true.')
bobj.all_options['wrapper_save_state'] = '1'
self.assertTrue(bobj._save_save(),
'unexpected save_state directory found')
saves_dir.return_value = bobj.save_filename
with open(bobj.save_filename, 'w') as fobj:
fobj.write('asd')
self.assertTrue(bobj._save_save())
os.mkdir(os.path.join(self.dirname, 'fs-uae-save'))
self.assertTrue(bobj._save_save())
@@ -177,6 +181,12 @@ class TestBase(TestCase):
bobj.save_filename = "foobar_save.7z"
earch.return_value = 0
# By default there would be no save state persistence
self.assertTrue(bobj._load_save())
# set wrapper_save_state option, so we can proceed with test
bobj.all_options['wrapper_save_state'] = '1'
# fail to load save is not fatal
self.assertTrue(bobj._load_save())
@@ -234,14 +244,24 @@ class TestBase(TestCase):
self.assertFalse(bobj._validate_options())
bobj.all_options = {'wrapper': 'dummy'}
self.assertFalse(bobj._validate_options())
self.assertTrue(bobj._validate_options())
bobj.all_options = {'wrapper': 'dummy',
'wrapper_archiver': 'myarchiver'}
self.assertTrue(bobj._validate_options())
bobj.all_options = {'wrapper': 'dummy',
'wrapper_save_state': '1',
'wrapper_archiver': 'myarchiver'}
self.assertFalse(bobj._validate_options())
which.return_value = '7z'
bobj.all_options = {'wrapper': 'dummy',
'wrapper_save_state': '1'}
self.assertFalse(bobj._validate_options())
bobj.all_options = {'wrapper': 'dummy',
'wrapper_save_state': '1',
'wrapper_archiver': '7z'}
self.assertTrue(bobj._validate_options())

View File

@@ -14,7 +14,7 @@ class TestCD32(TestCase):
@mock.patch('fs_uae_wrapper.path.which')
def test_validate_options(self, which):
which.return_value = None
which.return_value = 'rar'
acd32 = cd32.CD32('Config.fs-uae', utils.CmdOption(), {})
self.assertFalse(acd32._validate_options())
@@ -23,32 +23,27 @@ 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.assertFalse(acd32._validate_options())
which.return_value = 'unrar'
acd32.all_options['wrapper_archiver'] = 'rar'
self.assertTrue(acd32._validate_options())
@mock.patch('tempfile.mkdtemp')
@mock.patch('fs_uae_wrapper.path.which')
@mock.patch('fs_uae_wrapper.base.Base._save_save')
@mock.patch('fs_uae_wrapper.base.Base._get_saves_dir')
@mock.patch('fs_uae_wrapper.base.Base._run_emulator')
@mock.patch('fs_uae_wrapper.base.Base._kickstart_option')
@mock.patch('fs_uae_wrapper.base.Base._load_save')
@mock.patch('fs_uae_wrapper.base.Base._copy_conf')
@mock.patch('fs_uae_wrapper.base.Base._load_save')
@mock.patch('fs_uae_wrapper.base.Base._extract')
def test_run(self, extr, cconf, lsave, kick, runemul, ssave, which,
mkdtemp):
def test_run(self, extract, load_save, copy_conf, kick_option,
run_emulator, get_save_dir, save_state, which, mkdtemp):
extr.return_value = False
cconf.return_value = False
lsave.return_value = False
kick.return_value = {}
runemul.return_value = False
ssave.return_value = False
extract.return_value = False
copy_conf.return_value = False
load_save.return_value = False
kick_option.return_value = {}
run_emulator.return_value = False
get_save_dir.return_value = False
save_state.return_value = False
which.return_value = 'unrar'
acd32 = cd32.CD32('Config.fs-uae', utils.CmdOption(), {})
@@ -60,21 +55,24 @@ class TestCD32(TestCase):
self.assertFalse(acd32.run())
extr.return_value = True
extract.return_value = True
self.assertFalse(acd32.run())
cconf.return_value = True
copy_conf.return_value = True
self.assertFalse(acd32.run())
lsave.return_value = True
self.assertTrue(acd32.run())
load_save.return_value = True
self.assertFalse(acd32.run())
kick.return_value = {'foo': 'bar'}
self.assertTrue(acd32.run())
kick_option.return_value = {'foo': 'bar'}
self.assertFalse(acd32.run())
self.assertDictEqual(acd32.fsuae_options, {'foo': 'bar'})
runemul.return_value = True
run_emulator.return_value = True
self.assertTrue(acd32.run())
get_save_dir.return_value = True
self.assertFalse(acd32.run())
ssave.return_value = True
save_state.return_value = True
self.assertTrue(acd32.run())