Fix various unittest failures.

Over the past few months some of the unittests have not kept up
with code changes and have stopped working.  This CL fixes that.

BUG=None
TEST=Ran all the unittests by hand.

Change-Id: I4fdd09846ae92ce2d45ec478a39ff3ece30b4579
Reviewed-on: https://chrome-internal-review.googlesource.com/214134
Reviewed-by: Luis Lozano <llozano@chromium.org>
Commit-Queue: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>

6 files changed, 14 insertions, 11 deletions

diff --git a/crosperf/crosperf_unittest.py b/crosperf/crosperf_unittest.py
index 9fc504a2..3af3507f 100644
--- a/crosperf/crosperf_unittest.py
+++ b/crosperf/crosperf_unittest.py
@@ -60,7 +60,7 @@ class CrosperfTest(unittest.TestCase):
     self.assertEqual(len(options_before), 3)
     crosperf.SetupParserOptions(parser)
     options_after = parser._get_all_options()
-    self.assertEqual(len(options_after), 25)
+    self.assertEqual(len(options_after), 26)
 
 
   def test_convert_options_to_settings(self):
@@ -78,7 +78,7 @@ class CrosperfTest(unittest.TestCase):
     settings = crosperf.ConvertOptionsToSettings(options)
     self.assertIsNotNone(settings)
     self.assertIsInstance(settings, settings_factory.GlobalSettings)
-    self.assertEqual(len(settings.fields), 21)
+    self.assertEqual(len(settings.fields), 22)
     self.assertTrue(settings.GetField('rerun'))
     argv = ['crosperf/crosperf.py', 'temp.exp']
     options, args = parser.parse_args(argv)
diff --git a/crosperf/experiment_factory_unittest.py b/crosperf/experiment_factory_unittest.py
index e659693a..c483be5f 100755
--- a/crosperf/experiment_factory_unittest.py
+++ b/crosperf/experiment_factory_unittest.py
@@ -194,7 +194,7 @@ class ExperimentFactoryTest(unittest.TestCase):
 
     label_settings_2 = settings_factory.LabelSettings("official_image_label")
     label_settings_2.SetField("chromeos_root", "chromeos")
-    label_settings.SetField("build", "official-dev")
+    label_settings_2.SetField("build", "official-dev")
     label_settings_2.GetXbuddyPath = FakeGetXbuddyPath
 
     mock_experiment_file.all_settings.append (label_settings_2)
@@ -207,7 +207,8 @@ class ExperimentFactoryTest(unittest.TestCase):
 
 
   def test_get_default_remotes(self):
-    board_list = ['x86-zgb', 'x86-alex', 'lumpy', 'stumpy', 'parrot', 'daisy']
+    board_list = ['x86-alex', 'lumpy', 'stumpy', 'parrot', 'daisy', 'peach_pit',
+                  'peppy', 'squawks']
 
     ef = ExperimentFactory()
     self.assertRaises(Exception, ef.GetDefaultRemotes, 'bad-board')
diff --git a/crosperf/experiment_file_unittest.py b/crosperf/experiment_file_unittest.py
index 41e4a4c6..1adba31e 100755
--- a/crosperf/experiment_file_unittest.py
+++ b/crosperf/experiment_file_unittest.py
@@ -64,8 +64,8 @@ EXPERIMENT_FILE_3 = """
   }
   """
 
-OUTPUT_FILE="""remote: chromeos-alex3
-board: x86-alex
+OUTPUT_FILE="""board: x86-alex
+remote: chromeos-alex3
 perf_args: record -a -e cycles
 
 benchmark: PageCycler {
diff --git a/crosperf/machine_manager_unittest.py b/crosperf/machine_manager_unittest.py
index 4ce1d7f2..ee59cc88 100755
--- a/crosperf/machine_manager_unittest.py
+++ b/crosperf/machine_manager_unittest.py
@@ -65,7 +65,7 @@ class MachineManagerTest(unittest.TestCase):
 
     mock_isdir.return_value = True
     self.mm = machine_manager.MachineManager("/usr/local/chromeos", 0,
-                                             "average", self.mock_cmd_exec,
+                                             "average", None, self.mock_cmd_exec,
                                              self.mock_logger)
 
     self.mock_lumpy1.name = 'lumpy1'
@@ -393,7 +393,7 @@ class MachineManagerTest(unittest.TestCase):
     #   - current time minus release time is > 20.
     self.mock_lumpy1.locked = False
     self.mock_lumpy1.checksum = "123"
-    self.mock_lumpy1.released_time = 0
+    self.mock_lumpy1.released_time = time.time() - 8
     m = self.mm.AcquireMachine(LABEL_LUMPY.chromeos_image, LABEL_LUMPY, True)
     self.assertEqual(m, self.mock_lumpy1)
     self.assertTrue(self.mock_lumpy1.locked)
diff --git a/crosperf/settings_factory_unittest.py b/crosperf/settings_factory_unittest.py
index 6c0d9072..5dcd35fa 100644
--- a/crosperf/settings_factory_unittest.py
+++ b/crosperf/settings_factory_unittest.py
@@ -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), 21)
+    self.assertEqual(len(res.fields), 22)
     self.assertEqual(res.GetField('name'), '')
     self.assertEqual(res.GetField('board'), '')
     self.assertEqual(res.GetField('remote'), [])
@@ -88,7 +88,7 @@ class SettingsFactoryTest(unittest.TestCase):
     g_settings = settings_factory.SettingsFactory().GetSettings ('global',
                                                                  'global')
     self.assertIsInstance(g_settings, settings_factory.GlobalSettings)
-    self.assertEqual(len(g_settings.fields), 21)
+    self.assertEqual(len(g_settings.fields), 22)
 
 
 if __name__ == "__main__":
diff --git a/crosperf/suite_runner_unittest.py b/crosperf/suite_runner_unittest.py
index 524ca15a..6ee548b0 100644
--- a/crosperf/suite_runner_unittest.py
+++ b/crosperf/suite_runner_unittest.py
@@ -259,7 +259,9 @@ class SuiteRunnerTest(unittest.TestCase):
     args_dict = mock_chroot_runcmd.call_args_list[0][1]
     self.assertEqual(args_list[0], '/tmp/chromeos')
     self.assertEqual(args_list[1],
-                     ('/usr/bin/test_that --board=lumpy --args=" test=octane '
+                     ('/usr/bin/test_that --autotest_dir '
+                      '~/trunk/src/third_party/autotest/files '
+                      ' --board=lumpy --args=" test=octane '
                       'profiler=custom_perf profiler_args=\'record -a -e '
                       'cycles,instructions\'" lumpy1.cros telemetry_Crosperf'))
     self.assertEqual(args_dict['cros_sdk_options'],