diff options
author | Giuseppe Lavagetto <lavagetto@gmail.com> | 2014-03-21 07:37:54 +0100 |
---|---|---|
committer | Giuseppe Lavagetto <lavagetto@gmail.com> | 2014-03-21 07:37:54 +0100 |
commit | 128d2991c82d05bd2d2cee5bb5079142e9a16c86 (patch) | |
tree | 260d59523b928fa223f659865581f6bc4a2ea564 /src | |
parent | 5db5959a2e1d45ebf9a0b4a3368861d1a6918557 (diff) |
Make travis work with v0.3.0.
The etcd build script has chaged the location of the executable so the
travis build scripts need to be changed accordingly.
Signed-off-by: Giuseppe Lavagetto <lavagetto@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/etcd/tests/integration/test_election.py | 5 | ||||
-rw-r--r-- | src/etcd/tests/integration/test_lock.py | 2 | ||||
-rw-r--r-- | src/etcd/tests/integration/test_simple.py | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/etcd/tests/integration/test_election.py b/src/etcd/tests/integration/test_election.py index 11e333d..76f397b 100644 --- a/src/etcd/tests/integration/test_election.py +++ b/src/etcd/tests/integration/test_election.py @@ -17,9 +17,8 @@ class TestElection(test_simple.EtcdIntegrationTest): def test_set_invalid_ttl(self): - self.assertRaises(etcd.EtcdException, self.client.election.set, '/mysql', name='foo.example.com', ttl='ciao') + self.assertRaises(ValueError, self.client.election.set, '/mysql', name='foo.example.com', ttl='ciao') - @unittest.skip def test_get_non_existing(self): """This is actually expected to fail. See https://github.com/coreos/etcd/issues/446""" self.assertRaises(etcd.EtcdException, self.client.election.get, '/foobar') @@ -32,4 +31,4 @@ class TestElection(test_simple.EtcdIntegrationTest): e.set('/mysql', name='foo', ttl=1) time.sleep(2) self.assertRaises(etcd.EtcdException, e.get, '/mysql') - self.assertRaises(etcd.EtcdException, e.delete, '/mysql', name='foo') + self.assertRaises(KeyError, e.delete, '/mysql', name='foo') diff --git a/src/etcd/tests/integration/test_lock.py b/src/etcd/tests/integration/test_lock.py index ac2dd3b..a5d8744 100644 --- a/src/etcd/tests/integration/test_lock.py +++ b/src/etcd/tests/integration/test_lock.py @@ -22,7 +22,7 @@ class TestLocks(test_simple.EtcdIntegrationTest): ttl = 'invalid' expected_index = 'invalid' lock = self.client.get_lock(key, ttl=ttl) - self.assertRaises(etcd.EtcdException, lock.acquire) + self.assertRaises(ValueError, lock.acquire) def test_acquire_lock_with_context_manager(self): key = '/testkey' diff --git a/src/etcd/tests/integration/test_simple.py b/src/etcd/tests/integration/test_simple.py index b658301..45dea29 100644 --- a/src/etcd/tests/integration/test_simple.py +++ b/src/etcd/tests/integration/test_simple.py @@ -127,6 +127,7 @@ class TestSimple(EtcdIntegrationTest): self.client.write('/dir', None, dir=True, ttl=30) res = self.client.write('/dir', None, dir=True, ttl=31, prevExist=True) self.assertEquals(res.ttl, 31) + res = self.client.get('/dir') res.ttl = 120 new_res = self.client.update(res) self.assertEquals(new_res.ttl, 120) |