The branch, master has been updated via 3330c79 tdb: eliminate deprecation warnings in python tests via 7b3fb85 ctdb: Fix CID 1353175 Logically dead code via e23ab7d ctdb: Fix CID 1353176 Logically dead code from d3be72a idmap_ad: Fix a copy&paste error
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3330c79324fe8316a2d122d3f2bf47c4e2c75c0c Author: Michael Adam <ob...@samba.org> Date: Mon Feb 15 11:33:10 2016 +0100 tdb: eliminate deprecation warnings in python tests assertEquals() is superseded by assertEqual() Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Michael Adam <ob...@samba.org> Autobuild-Date(master): Tue Feb 16 19:58:39 CET 2016 on sn-devel-144 commit 7b3fb853a42ae02aae7420b09d21aad727284bbe Author: Volker Lendecke <v...@samba.org> Date: Tue Feb 16 11:20:56 2016 +0100 ctdb: Fix CID 1353175 Logically dead code Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Michael Adam <ob...@samba.org> commit e23ab7d40801c3121c7df98f6ea4cdc9a5e0bd89 Author: Volker Lendecke <v...@samba.org> Date: Tue Feb 16 11:18:40 2016 +0100 ctdb: Fix CID 1353176 Logically dead code Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Michael Adam <ob...@samba.org> ----------------------------------------------------------------------- Summary of changes: ctdb/server/ctdb_takeover.c | 5 ++-- ctdb/server/ipalloc_common.c | 7 +++--- lib/tdb/python/tests/simple.py | 52 +++++++++++++++++++++--------------------- 3 files changed, 32 insertions(+), 32 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index cdb4601..62af1e6 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/server/ctdb_takeover.c @@ -1340,17 +1340,18 @@ create_merged_ip_list(struct ctdb_context *ctdb, struct ipalloc_state *ipalloc_s ctdb->ip_tree = trbt_create(ctdb, 0); for (i=0; i < ctdb->num_nodes; i++) { - public_ips = &ipalloc_state->known_public_ips[i]; if (ctdb->nodes[i]->flags & NODE_FLAGS_DELETED) { continue; } /* there were no public ips for this node */ - if (public_ips == NULL) { + if (ipalloc_state->known_public_ips == NULL) { continue; } + public_ips = &ipalloc_state->known_public_ips[i]; + for (j=0; j < public_ips->num; j++) { struct public_ip_list *tmp_ip; diff --git a/ctdb/server/ipalloc_common.c b/ctdb/server/ipalloc_common.c index c84359b..95d5ecf 100644 --- a/ctdb/server/ipalloc_common.c +++ b/ctdb/server/ipalloc_common.c @@ -65,13 +65,12 @@ static bool can_node_host_ip(struct ipalloc_state *ipalloc_state, if (ipalloc_state->noiphost[pnn]) { return false; } - - public_ips = &ipalloc_state->available_public_ips[pnn]; - - if (public_ips == NULL) { + if (ipalloc_state->available_public_ips == NULL) { return false; } + public_ips = &ipalloc_state->available_public_ips[pnn]; + for (i=0; i<public_ips->num; i++) { if (ctdb_same_ip(&ip->addr, &public_ips->ip[i].addr)) { /* yes, this node can serve this public ip */ diff --git a/lib/tdb/python/tests/simple.py b/lib/tdb/python/tests/simple.py index b3136dd..1518078 100644 --- a/lib/tdb/python/tests/simple.py +++ b/lib/tdb/python/tests/simple.py @@ -43,7 +43,7 @@ class InternalTdbTests(TestCase): self.tdb = tdb.Tdb() # repr used to crash on internal db - self.assertEquals(repr(self.tdb), "Tdb(<internal>)") + self.assertEqual(repr(self.tdb), "Tdb(<internal>)") class CommonTdbTests(TestCase): @@ -111,12 +111,12 @@ class SimpleTdbTests(TestCase): def test_store(self): self.tdb.store(b"bar", b"bla") - self.assertEquals(b"bla", self.tdb.get(b"bar")) + self.assertEqual(b"bla", self.tdb.get(b"bar")) def test_getitem(self): self.tdb[b"bar"] = b"foo" self.tdb.reopen() - self.assertEquals(b"foo", self.tdb[b"bar"]) + self.assertEqual(b"foo", self.tdb[b"bar"]) def test_delete(self): self.tdb[b"bar"] = b"foo" @@ -139,21 +139,21 @@ class SimpleTdbTests(TestCase): self.tdb[b"brainslug"] = b"2" l = list(self.tdb) l.sort() - self.assertEquals([b"bla", b"brainslug"], l) + self.assertEqual([b"bla", b"brainslug"], l) def test_transaction_cancel(self): self.tdb[b"bloe"] = b"2" self.tdb.transaction_start() self.tdb[b"bloe"] = b"1" self.tdb.transaction_cancel() - self.assertEquals(b"2", self.tdb[b"bloe"]) + self.assertEqual(b"2", self.tdb[b"bloe"]) def test_transaction_commit(self): self.tdb[b"bloe"] = b"2" self.tdb.transaction_start() self.tdb[b"bloe"] = b"1" self.tdb.transaction_commit() - self.assertEquals(b"1", self.tdb[b"bloe"]) + self.assertEqual(b"1", self.tdb[b"bloe"]) def test_transaction_prepare_commit(self): self.tdb[b"bloe"] = b"2" @@ -161,7 +161,7 @@ class SimpleTdbTests(TestCase): self.tdb[b"bloe"] = b"1" self.tdb.transaction_prepare_commit() self.tdb.transaction_commit() - self.assertEquals(b"1", self.tdb[b"bloe"]) + self.assertEqual(b"1", self.tdb[b"bloe"]) def test_iterkeys(self): self.tdb[b"bloe"] = b"2" @@ -170,14 +170,14 @@ class SimpleTdbTests(TestCase): i = self.tdb.keys() else: i = self.tdb.iterkeys() - self.assertEquals(set([b"bloe", b"bla"]), set([next(i), next(i)])) + self.assertEqual(set([b"bloe", b"bla"]), set([next(i), next(i)])) def test_clear(self): self.tdb[b"bloe"] = b"2" self.tdb[b"bla"] = b"25" - self.assertEquals(2, len(list(self.tdb))) + self.assertEqual(2, len(list(self.tdb))) self.tdb.clear() - self.assertEquals(0, len(list(self.tdb))) + self.assertEqual(0, len(list(self.tdb))) def test_repack(self): self.tdb[b"foo"] = b"abc" @@ -190,12 +190,12 @@ class SimpleTdbTests(TestCase): seq1 = self.tdb.seqnum self.tdb.increment_seqnum_nonblock() seq2 = self.tdb.seqnum - self.assertEquals(seq2-seq1, 1) + self.assertEqual(seq2-seq1, 1) def test_len(self): - self.assertEquals(0, len(list(self.tdb))) + self.assertEqual(0, len(list(self.tdb))) self.tdb[b"entry"] = b"value" - self.assertEquals(1, len(list(self.tdb))) + self.assertEqual(1, len(list(self.tdb))) class TdbTextTests(TestCase): @@ -211,12 +211,12 @@ class TdbTextTests(TestCase): def test_store(self): self.tdb.text.store("bar", "bla") - self.assertEquals("bla", self.tdb.text.get("bar")) + self.assertEqual("bla", self.tdb.text.get("bar")) def test_getitem(self): self.tdb.text["bar"] = "foo" self.tdb.reopen() - self.assertEquals("foo", self.tdb.text["bar"]) + self.assertEqual("foo", self.tdb.text["bar"]) def test_delete(self): self.tdb.text["bar"] = "foo" @@ -239,21 +239,21 @@ class TdbTextTests(TestCase): self.tdb.text["brainslug"] = "2" l = list(self.tdb.text) l.sort() - self.assertEquals(["bla", "brainslug"], l) + self.assertEqual(["bla", "brainslug"], l) def test_transaction_cancel(self): self.tdb.text["bloe"] = "2" self.tdb.transaction_start() self.tdb.text["bloe"] = "1" self.tdb.transaction_cancel() - self.assertEquals("2", self.tdb.text["bloe"]) + self.assertEqual("2", self.tdb.text["bloe"]) def test_transaction_commit(self): self.tdb.text["bloe"] = "2" self.tdb.transaction_start() self.tdb.text["bloe"] = "1" self.tdb.transaction_commit() - self.assertEquals("1", self.tdb.text["bloe"]) + self.assertEqual("1", self.tdb.text["bloe"]) def test_transaction_prepare_commit(self): self.tdb.text["bloe"] = "2" @@ -261,7 +261,7 @@ class TdbTextTests(TestCase): self.tdb.text["bloe"] = "1" self.tdb.transaction_prepare_commit() self.tdb.transaction_commit() - self.assertEquals("1", self.tdb.text["bloe"]) + self.assertEqual("1", self.tdb.text["bloe"]) def test_iterkeys(self): self.tdb.text["bloe"] = "2" @@ -270,14 +270,14 @@ class TdbTextTests(TestCase): i = self.tdb.text.keys() else: i = self.tdb.text.iterkeys() - self.assertEquals(set(["bloe", "bla"]), set([next(i), next(i)])) + self.assertEqual(set(["bloe", "bla"]), set([next(i), next(i)])) def test_clear(self): self.tdb.text["bloe"] = "2" self.tdb.text["bla"] = "25" - self.assertEquals(2, len(list(self.tdb))) + self.assertEqual(2, len(list(self.tdb))) self.tdb.clear() - self.assertEquals(0, len(list(self.tdb))) + self.assertEqual(0, len(list(self.tdb))) def test_repack(self): self.tdb.text["foo"] = "abc" @@ -286,17 +286,17 @@ class TdbTextTests(TestCase): self.tdb.repack() def test_len(self): - self.assertEquals(0, len(list(self.tdb.text))) + self.assertEqual(0, len(list(self.tdb.text))) self.tdb.text["entry"] = "value" - self.assertEquals(1, len(list(self.tdb.text))) + self.assertEqual(1, len(list(self.tdb.text))) def test_text_and_binary(self): text = u'\xfa\u0148\xef\xe7\xf8\xf0\xea' bytestr = text.encode('utf-8') self.tdb[b"entry"] = bytestr self.tdb.text[u"entry2"] = text - self.assertEquals(self.tdb.text["entry"], text) - self.assertEquals(self.tdb[b"entry2"], bytestr) + self.assertEqual(self.tdb.text["entry"], text) + self.assertEqual(self.tdb[b"entry2"], bytestr) assert self.tdb.text.raw == self.tdb -- Samba Shared Repository