commit 2ef1d4e032f9b6614b2c5c14c78dba7e2a76f86a
author Chris Masone <cmasone@chromium.org> Tue Dec 20 11:06:53 2011 -0800
committer Gerrit <chrome-bot@google.com> Tue Dec 20 16:48:00 2011 -0800
tree 9e1b98727486f9d9f20a31b463f114e65a027d50
parent d9f0ed16d13613b97633a20e1a8826cd2e0b9a0e

[autotest] Add a harness for running dynamic suites from your workstation

To enable development on the dynamic suite infrastructure.

BUG=None
TEST=./server/autoserv test_suites/dev_harness

Change-Id: Ib2a63d19f919f5e256f0a36dbca33e1b52f92875
Reviewed-on: https://gerrit.chromium.org/gerrit/13240
Commit-Ready: Chris Masone <cmasone@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>

server/cros/dynamic_suite_unittest.py

diff --git a/server/cros/dynamic_suite_unittest.py b/server/cros/dynamic_suite_unittest.py
index 226657e..696ce31 100755
--- a/server/cros/dynamic_suite_unittest.py
+++ b/server/cros/dynamic_suite_unittest.py
@@ -34,7 +34,7 @@
     @var _BOARD: fake board to reimage
     """
 
-    _URL = 'http://nothing'
+    _URL = 'http://nothing/%s'
     _NAME = 'name'
     _NUM = 4
     _BOARD = 'board'
@@ -149,15 +149,18 @@
         cf_getter.get_control_file_contents_by_name('autoupdate').AndReturn('')
         self.reimager._cf_getter = cf_getter
 
+        # Fake out getting the image URL pattern.
+        self.mox.StubOutWithMock(dynamic_suite, '_image_url_pattern')
+        dynamic_suite._image_url_pattern().AndReturn(self._URL)
+
         self.afe.create_job(
             control_file=mox.And(mox.StrContains(self._NAME),
-                                 mox.StrContains(self._URL)),
+                                 mox.StrContains(self._URL % self._NAME)),
             name=mox.StrContains(self._NAME),
             control_type='Server',
             meta_hosts=[self._BOARD] * self._NUM)
         self.mox.ReplayAll()
-        self.reimager._schedule_reimage_job(self._URL, self._NAME,
-                                            self._NUM, self._BOARD)
+        self.reimager._schedule_reimage_job(self._NAME, self._NUM, self._BOARD)
 
 
     def expect_attempt(self, success):
@@ -171,8 +174,7 @@
         self.reimager._ensure_version_label(mox.StrContains(self._NAME))
 
         self.mox.StubOutWithMock(self.reimager, '_schedule_reimage_job')
-        self.reimager._schedule_reimage_job(self._URL,
-                                            self._NAME,
+        self.reimager._schedule_reimage_job(self._NAME,
                                             self._NUM,
                                             self._BOARD).AndReturn(canary)
         if success is not None:
@@ -194,8 +196,7 @@
         rjob.record('START', mox.IgnoreArg(), mox.IgnoreArg())
         rjob.record('END GOOD', mox.IgnoreArg(), mox.IgnoreArg())
         self.mox.ReplayAll()
-        self.reimager.attempt(self._URL, self._NAME,
-                              self._NUM, self._BOARD, rjob.record)
+        self.reimager.attempt(self._NAME, self._NUM, self._BOARD, rjob.record)
 
 
     def testFailedReimage(self):
@@ -206,8 +207,7 @@
         rjob.record('START', mox.IgnoreArg(), mox.IgnoreArg())
         rjob.record('END FAIL', mox.IgnoreArg(), mox.IgnoreArg())
         self.mox.ReplayAll()
-        self.reimager.attempt(self._URL, self._NAME,
-                              self._NUM, self._BOARD, rjob.record)
+        self.reimager.attempt(self._NAME, self._NUM, self._BOARD, rjob.record)
 
 
     def testReimageThatNeverHappened(self):
@@ -219,8 +219,7 @@
         rjob.record('FAIL', mox.IgnoreArg(), canary.name, mox.IgnoreArg())
         rjob.record('END FAIL', mox.IgnoreArg(), mox.IgnoreArg())
         self.mox.ReplayAll()
-        self.reimager.attempt(self._URL, self._NAME,
-                              self._NUM, self._BOARD, rjob.record)
+        self.reimager.attempt(self._NAME, self._NUM, self._BOARD, rjob.record)
 
 
 class SuiteTest(mox.MoxTestBase):
@@ -394,7 +393,7 @@
                 """Compares this object to a recorded status."""
                 return self._equals_record(*args)
 
-            def _equals_record(self, status, subdir, name, reason):
+            def _equals_record(self, status, subdir, name, reason=None):
                 """Compares this object and fields of recorded status."""
                 if 'aborted' in self.entry and self.entry['aborted']:
                     return status == 'ABORT'