commit 4e750024e1e4f579d8383f1e47ae655da6abdd38
author Aviv Keshet <akeshet@chromium.org> Fri Mar 07 16:50:34 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Mar 11 00:26:15 2014 +0000
tree 7e68e92a25b1740171f2272cb51de4116d705455
parent 6f3d4ed823c2c0f7ffa615561df5e639542baac8

cbuildbot.py: correctly unpack dictionary from --mock-slave-status

This CL fixes cbuildbot's --mock-slave-status command so that the
pickled dictionaries that represent BuilderStatus objects are correctly
turned into BuilderStatus objects.

BUG=None
TEST=local tryjobs

Change-Id: I301258141c2fab1a2f0f404e16c167a4038555c8
Reviewed-on: https://chromium-review.googlesource.com/189374
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 75292b5..a4238b4 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -27,6 +27,7 @@
 from chromite.buildbot import cbuildbot_results as results_lib
 from chromite.buildbot import cbuildbot_run
 from chromite.buildbot import constants
+from chromite.buildbot import manifest_version
 from chromite.buildbot import remote_try
 from chromite.buildbot import repository
 from chromite.buildbot import tee
@@ -1693,8 +1694,10 @@
 
     if options.mock_slave_status is not None:
       with open(options.mock_slave_status, 'r') as f:
-        mock_status = pickle.load(f)
+        mock_statuses = pickle.load(f)
+        for key, value in mock_statuses.iteritems():
+          mock_statuses[key] = manifest_version.BuilderStatus(**value)
       stack.Add(mock.patch.object, stages.MasterSlaveSyncCompletionStage,
-                '_FetchSlaveStatuses', return_value=mock_status)
+                '_FetchSlaveStatuses', return_value=mock_statuses)
 
     _RunBuildStagesWrapper(options, build_config)