Merge remote-tracking branch 'upstream/master' into python-registry-v2

2015-10-26 14:44:16 -04:00 · 2015-10-26 14:44:16 -04:00 · 2c10d28afc
commit 2c10d28afc
parent b0185cc26f 195684d79c
13 changed files with 57 additions and 36 deletions
--- a/test/data/test.db
+++ b/test/data/test.db
--- a/test/test_buildman.py
+++ b/test/test_buildman.py
@ -224,7 +224,7 @@ class TestEphemeral(unittest.TestCase):
  @async_test
  def test_change_worker(self):
    # Send a signal to the callback that a worker key has been changed
-    set_result = Mock(sepc=etcd.EtcdResult)
+    set_result = Mock(spec=etcd.EtcdResult)
    set_result.action = 'set'
    set_result.key = self.mock_job_key