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

This commit is contained in:
Jake Moshenko 2015-10-26 14:44:16 -04:00
commit 2c10d28afc
13 changed files with 57 additions and 36 deletions

Binary file not shown.

View file

@ -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