diff options
| -rwxr-xr-x | crosperf/benchmark_unittest.py | 3 | ||||
| -rwxr-xr-x | crosperf/results_organizer_unittest.py | 2 | ||||
| -rwxr-xr-x | crosperf/settings_factory_unittest.py | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/crosperf/benchmark_unittest.py b/crosperf/benchmark_unittest.py index f7ab1895..469ac0e5 100755 --- a/crosperf/benchmark_unittest.py +++ b/crosperf/benchmark_unittest.py @@ -45,7 +45,8 @@ class BenchmarkTestCase(unittest.TestCase): # Check to see if the args to Benchmark have changed since the last time # this test was updated. args_list = ['self', 'name', 'test_name', 'test_args', 'iterations', - 'rm_chroot_tmp', 'perf_args', 'suite', 'show_all_results'] + 'rm_chroot_tmp', 'perf_args', 'suite', 'show_all_results', + 'retries', 'run_local'] arg_spec = inspect.getargspec(Benchmark.__init__) self.assertEqual(len(arg_spec.args), len(args_list)) for arg in args_list: diff --git a/crosperf/results_organizer_unittest.py b/crosperf/results_organizer_unittest.py index 7cb09316..c170f0a3 100755 --- a/crosperf/results_organizer_unittest.py +++ b/crosperf/results_organizer_unittest.py @@ -106,7 +106,7 @@ class ResultOrganizerTest(unittest.TestCase): i = 0 for b in benchmark_runs: - b.result = Result("", b.label, "average") + b.result = Result("", b.label, "average", "machine") b.result.keyvals = mock_instance.keyval[i] i += 1 diff --git a/crosperf/settings_factory_unittest.py b/crosperf/settings_factory_unittest.py index 5dcd35fa..3fcf952f 100755 --- a/crosperf/settings_factory_unittest.py +++ b/crosperf/settings_factory_unittest.py @@ -19,7 +19,7 @@ class BenchmarkSettingsTest(unittest.TestCase): def test_init(self): res = settings_factory.BenchmarkSettings("b_settings") self.assertIsNotNone(res) - self.assertEqual(len(res.fields), 4) + self.assertEqual(len(res.fields), 6) self.assertEqual(res.GetField('test_name'), '') self.assertEqual(res.GetField('test_args'), '') self.assertEqual(res.GetField('iterations'), 1) @@ -30,7 +30,7 @@ class LabelSettingsTest(unittest.TestCase): def test_init(self): res = settings_factory.LabelSettings("l_settings") self.assertIsNotNone(res) - self.assertEqual(len(res.fields), 7) + self.assertEqual(len(res.fields), 8) self.assertEqual(res.GetField('chromeos_image'), '') self.assertEqual(res.GetField('chromeos_root'), '') self.assertEqual(res.GetField('remote'), []) @@ -45,7 +45,7 @@ class GlobalSettingsTest(unittest.TestCase): def test_init(self): res = settings_factory.GlobalSettings("g_settings") self.assertIsNotNone(res) - self.assertEqual(len(res.fields), 22) + self.assertEqual(len(res.fields), 25) self.assertEqual(res.GetField('name'), '') self.assertEqual(res.GetField('board'), '') self.assertEqual(res.GetField('remote'), []) @@ -78,17 +78,17 @@ class SettingsFactoryTest(unittest.TestCase): l_settings = settings_factory.SettingsFactory().GetSettings ('label', 'label') self.assertIsInstance(l_settings, settings_factory.LabelSettings) - self.assertEqual(len(l_settings.fields), 7) + self.assertEqual(len(l_settings.fields), 8) b_settings = settings_factory.SettingsFactory().GetSettings ('benchmark', 'benchmark') self.assertIsInstance(b_settings, settings_factory.BenchmarkSettings) - self.assertEqual(len(b_settings.fields), 4) + self.assertEqual(len(b_settings.fields), 6) g_settings = settings_factory.SettingsFactory().GetSettings ('global', 'global') self.assertIsInstance(g_settings, settings_factory.GlobalSettings) - self.assertEqual(len(g_settings.fields), 22) + self.assertEqual(len(g_settings.fields), 25) if __name__ == "__main__": |