From 8528d28a42b5287cf9dd4da537dcbce91d64f18c Mon Sep 17 00:00:00 2001 From: gryf Date: Sat, 7 Jan 2017 13:24:23 +0100 Subject: [PATCH] Get rid of unneeded _run_emulator parameter --- fs_uae_wrapper/archive.py | 2 +- fs_uae_wrapper/base.py | 6 +++--- fs_uae_wrapper/cd32.py | 2 +- fs_uae_wrapper/savestate.py | 2 +- fs_uae_wrapper/wrapper.py | 8 ++++---- tests/test_base.py | 11 +++++++++-- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/fs_uae_wrapper/archive.py b/fs_uae_wrapper/archive.py index 2d9fa23..35aebb8 100644 --- a/fs_uae_wrapper/archive.py +++ b/fs_uae_wrapper/archive.py @@ -40,7 +40,7 @@ class Wrapper(base.ArchiveBase): if not self._copy_conf(): return False - if not self._run_emulator(self.fsuae_options.list()): + if not self._run_emulator(): return False if self._get_saves_dir(): diff --git a/fs_uae_wrapper/base.py b/fs_uae_wrapper/base.py index ec1bae3..12a725b 100644 --- a/fs_uae_wrapper/base.py +++ b/fs_uae_wrapper/base.py @@ -78,11 +78,11 @@ class Base(object): os.path.join(self.dir, 'Config.fs-uae')) return True - def _run_emulator(self, fsuae_options): - """execute fs-uae in provided directory""" + def _run_emulator(self): + """execute fs-uae""" curdir = os.path.abspath('.') os.chdir(self.dir) - utils.run_command(['fs-uae'] + fsuae_options) + utils.run_command(['fs-uae'] + self.fsuae_options.list()) os.chdir(curdir) return True diff --git a/fs_uae_wrapper/cd32.py b/fs_uae_wrapper/cd32.py index dede7cc..42c17a4 100644 --- a/fs_uae_wrapper/cd32.py +++ b/fs_uae_wrapper/cd32.py @@ -39,7 +39,7 @@ class Wrapper(base.ArchiveBase): if not method(): return False - if not self._run_emulator(self.fsuae_options.list()): + if not self._run_emulator(): return False if self._get_saves_dir(): diff --git a/fs_uae_wrapper/savestate.py b/fs_uae_wrapper/savestate.py index a627abc..20c1ce7 100644 --- a/fs_uae_wrapper/savestate.py +++ b/fs_uae_wrapper/savestate.py @@ -38,7 +38,7 @@ class Wrapper(base.Base): if not self._copy_conf(): return False - if not self._run_emulator(self.fsuae_options.list()): + if not self._run_emulator(): return False if self._get_saves_dir(): diff --git a/fs_uae_wrapper/wrapper.py b/fs_uae_wrapper/wrapper.py index a1f53b0..1358956 100644 --- a/fs_uae_wrapper/wrapper.py +++ b/fs_uae_wrapper/wrapper.py @@ -46,9 +46,9 @@ def usage(): def run(): """run wrapper module""" - config_file, cmd_options = parse_args() + config_file, fsuae_options = parse_args() - if 'help' in cmd_options: + if 'help' in fsuae_options: usage() sys.exit(0) @@ -63,7 +63,7 @@ def run(): sys.stderr.write('Error: Configuration file have syntax issues\n') sys.exit(2) - wrapper_module = cmd_options.get(WRAPPER_KEY) + wrapper_module = fsuae_options.get(WRAPPER_KEY) if not wrapper_module: wrapper_module = configuration.get(WRAPPER_KEY) @@ -78,7 +78,7 @@ def run(): "exists.\n" % wrapper_module) sys.exit(3) - if not wrapper.run(config_file, cmd_options, configuration): + if not wrapper.run(config_file, fsuae_options, configuration): sys.exit(4) diff --git a/tests/test_base.py b/tests/test_base.py index 4c898b5..80fd972 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -110,15 +110,22 @@ class TestBase(TestCase): bobj = base.Base('Config.fs-uae', utils.CmdOption(), {}) bobj.dir = self.dirname - self.assertTrue(bobj._run_emulator([])) + self.assertTrue(bobj._run_emulator()) run.assert_called_once_with(['fs-uae']) # Errors from emulator are not fatal to wrappers run.reset_mock() run.return_value = False - self.assertTrue(bobj._run_emulator([])) + self.assertTrue(bobj._run_emulator()) run.assert_called_once_with(['fs-uae']) + # pass the options + bobj.fsuae_options = utils.CmdOption({'foo': '1'}) + run.reset_mock() + run.return_value = False + self.assertTrue(bobj._run_emulator()) + run.assert_called_once_with(['fs-uae', '--foo']) + @mock.patch('fs_uae_wrapper.base.Base._get_saves_dir') @mock.patch('fs_uae_wrapper.utils.create_archive') def test_save_save(self, carch, saves_dir):