From 8cc2f72e2098017f433649bf74dee347f74a4a33 Mon Sep 17 00:00:00 2001 From: Bernie Hackett Date: Sat, 2 Jun 2018 16:12:57 -0700 Subject: [PATCH] PYTHON-1471 - Reenable arbiter tests on 4.0 and latest --- test/test_client.py | 3 --- test/test_read_preferences.py | 3 --- test/test_replica_set_client.py | 9 ++------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/test/test_client.py b/test/test_client.py index b1c7394d8..78c37247a 100644 --- a/test/test_client.py +++ b/test/test_client.py @@ -523,9 +523,6 @@ class TestClient(IntegrationTest): self.assertEqual(eval(the_repr), client) def test_getters(self): - if (client_context.version >= (3, 7, 2) - and client_context.auth_enabled and client_context.is_rs): - raise SkipTest("Disabled due to SERVER-32845") wait_until(lambda: client_context.nodes == self.client.nodes, "find all nodes") diff --git a/test/test_read_preferences.py b/test/test_read_preferences.py index b482838fd..1c84aa3d9 100644 --- a/test/test_read_preferences.py +++ b/test/test_read_preferences.py @@ -231,9 +231,6 @@ class TestReadPreferences(TestReadPreferencesBase): localthresholdms=-1) def test_zero_latency(self): - if (client_context.version >= (3, 7, 2) - and client_context.auth_enabled and client_context.is_rs): - raise SkipTest("Disabled due to SERVER-32845") ping_times = set() # Generate unique ping times. while len(ping_times) < len(self.client.nodes): diff --git a/test/test_replica_set_client.py b/test/test_replica_set_client.py index d3da31d9b..aa6b9f4b2 100644 --- a/test/test_replica_set_client.py +++ b/test/test_replica_set_client.py @@ -111,18 +111,13 @@ class TestReplicaSetClient(TestReplicaSetClientBase): c.admin.command('ping') wait_until(lambda: c.primary == self.primary, "discover primary") + wait_until(lambda: c.arbiters == self.arbiters, "discover arbiters") wait_until(lambda: c.secondaries == self.secondaries, "discover secondaries") - # SERVER-32845 - if not (client_context.version >= (3, 7, 2) - and client_context.auth_enabled and client_context.is_rs): - wait_until(lambda: c.arbiters == self.arbiters, - "discover arbiters") - self.assertEqual(c.arbiters, self.arbiters) - self.assertEqual(c.primary, self.primary) self.assertEqual(c.secondaries, self.secondaries) + self.assertEqual(c.arbiters, self.arbiters) self.assertEqual(c.max_pool_size, 100) # Make sure MongoClient's properties are copied to Database and