Skip to content

Commit 6004e2b

Browse files
ajdavisajdavis
committed
PYTHON-525 Use MongoClient in test_ha.
1 parent a3bf624 commit 6004e2b

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

‎test/high_availability/test_ha.py‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
OperationFailure,
3131
ConnectionFailure,
3232
WTimeoutError)
33-
from pymongo.mongo_replica_set_client import MongoReplicaSetClient
3433
from pymongo.mongo_client import MongoClient
3534
from pymongo.read_preferences import ReadPreference
3635
from pymongo.server_description import ServerDescription
@@ -98,7 +97,7 @@ def setUp(self):
9897
self.seed, self.name = res
9998

10099
def test_secondary_connection(self):
101-
self.c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
100+
self.c = MongoClient(self.seed, replicaSet=self.name)
102101
wait_until(lambda: len(self.c.secondaries), "discover secondary")
103102
db = self.c.pymongo_test
104103

@@ -199,7 +198,7 @@ def setUp(self):
199198
self.seed, self.name = res
200199

201200
def test_passive_and_hidden(self):
202-
self.c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
201+
self.c = MongoClient(self.seed, replicaSet=self.name)
203202

204203
passives = ha_tools.get_passives()
205204
passives = partition_nodes(passives)
@@ -230,7 +229,7 @@ def setUp(self):
230229
self.seed, self.name = res
231230

232231
def test_monitor_removes_recovering_member(self):
233-
self.c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
232+
self.c = MongoClient(self.seed, replicaSet=self.name)
234233

235234
secondaries = ha_tools.get_secondaries()
236235

@@ -267,7 +266,7 @@ def test_recovering_member_triggers_refresh(self):
267266
# To test that find_one() and count() trigger immediate refreshes,
268267
# we'll create a separate client for each
269268
self.c_find_one, self.c_count = [
270-
MongoReplicaSetClient(
269+
MongoClient(
271270
self.seed, replicaSet=self.name, read_preference=SECONDARY)
272271
for _ in xrange(2)]
273272

@@ -302,8 +301,8 @@ def test_recovering_member_triggers_refresh(self):
302301
self.assertEqual(partition_node(primary), self.c_count.primary)
303302

304303
def test_stepdown_triggers_refresh(self):
305-
c_find_one = MongoReplicaSetClient(self.seed, replicaSet=self.name)
306-
c_count = MongoReplicaSetClient(self.seed, replicaSet=self.name)
304+
c_find_one = MongoClient(self.seed, replicaSet=self.name)
305+
c_count = MongoClient(self.seed, replicaSet=self.name)
307306

308307
# We've started the primary and one secondary
309308
wait_until(lambda: len(c_find_one.secondaries), "discover secondary")
@@ -334,7 +333,7 @@ def setUp(self):
334333
self.seed, self.name = res
335334

336335
def test_primary_failure(self):
337-
c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
336+
c = MongoClient(self.seed, replicaSet=self.name)
338337
wait_until(lambda: c.primary, "discover primary")
339338
wait_until(lambda: len(c.secondaries) == 2, "discover secondaries")
340339
old_primary = c.primary
@@ -351,7 +350,7 @@ def test_primary_failure(self):
351350
timeout=30)
352351

353352
def test_secondary_failure(self):
354-
c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
353+
c = MongoClient(self.seed, replicaSet=self.name)
355354
wait_until(lambda: c.primary, "discover primary")
356355
wait_until(lambda: len(c.secondaries) == 2, "discover secondaries")
357356
primary = c.primary
@@ -373,7 +372,7 @@ def test_secondary_failure(self):
373372
timeout=30)
374373

375374
def test_primary_stepdown(self):
376-
c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
375+
c = MongoClient(self.seed, replicaSet=self.name)
377376
wait_until(lambda: c.primary, "discover primary")
378377
wait_until(lambda: len(c.secondaries) == 2, "discover secondaries")
379378

@@ -401,7 +400,7 @@ def setUp(self):
401400
self.seed, self.name = res
402401

403402
def test_writes_with_failover(self):
404-
c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
403+
c = MongoClient(self.seed, replicaSet=self.name)
405404
wait_until(lambda: c.primary, "discover primary")
406405
wait_until(lambda: len(c.secondaries) == 2, "discover secondaries")
407406
primary = c.primary
@@ -445,7 +444,7 @@ def setUp(self):
445444
self.seed, self.name = res
446445

447446
def test_read_with_failover(self):
448-
c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
447+
c = MongoClient(self.seed, replicaSet=self.name)
449448
wait_until(lambda: c.primary, "discover primary")
450449
wait_until(lambda: len(c.secondaries) == 2, "discover secondaries")
451450

@@ -520,7 +519,7 @@ def setUp(self):
520519
self.other_secondary_tags = ha_tools.get_tags(other_secondary)
521520
self.other_secondary_dc = {'dc': self.other_secondary_tags['dc']}
522521

523-
self.c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
522+
self.c = MongoClient(self.seed, replicaSet=self.name)
524523
self.db = self.c.pymongo_test
525524
self.w = len(self.c.secondaries) + 1
526525
self.db.test.remove({}, w=self.w)
@@ -545,7 +544,7 @@ def test_read_preference(self):
545544
#
546545
# For each state, we verify the behavior of PRIMARY,
547546
# PRIMARY_PREFERRED, SECONDARY, SECONDARY_PREFERRED, and NEAREST
548-
c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
547+
c = MongoClient(self.seed, replicaSet=self.name)
549548
wait_until(lambda: c.primary, "discover primary")
550549
wait_until(lambda: len(c.secondaries) == 2, "discover secondaries")
551550

@@ -754,7 +753,7 @@ def unpartition_node(node):
754753
def test_pinning(self):
755754
raise SkipTest('Pinning not implemented in PyMongo 3')
756755

757-
c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
756+
c = MongoClient(self.seed, replicaSet=self.name)
758757

759758
# Verify that changing the mode unpins the member. We'll try it for
760759
# every relevant change of mode.
@@ -816,7 +815,7 @@ def setUp(self):
816815
]
817816

818817
res = ha_tools.start_replica_set(members, auth=True)
819-
self.c = MongoReplicaSetClient(res[0], replicaSet=res[1])
818+
self.c = MongoClient(res[0], replicaSet=res[1])
820819

821820
# Add an admin user to enable auth
822821
self.c.admin.add_user('admin', 'adminpass')
@@ -863,7 +862,7 @@ def test_alive(self):
863862
secondary = ha_tools.get_random_secondary()
864863
primary_cx = connected(MongoClient(primary))
865864
secondary_cx = connected(MongoClient(secondary))
866-
rsc = connected(MongoReplicaSetClient(self.seed, replicaSet=self.name))
865+
rsc = connected(MongoClient(self.seed, replicaSet=self.name))
867866

868867
try:
869868
self.assertTrue(primary_cx.alive())
@@ -941,7 +940,7 @@ def setUp(self):
941940

942941
members = [{}, {}, {'arbiterOnly': True}]
943942
res = ha_tools.start_replica_set(members)
944-
self.c = MongoReplicaSetClient(res[0], replicaSet=res[1])
943+
self.c = MongoClient(res[0], replicaSet=res[1])
945944
self.c.start_request()
946945

947946
def test_request_during_failover(self):
@@ -1004,7 +1003,7 @@ def setUp(self):
10041003
members = [{}, {}]
10051004
res = ha_tools.start_replica_set(members)
10061005
self.seed, self.name = res
1007-
self.c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
1006+
self.c = MongoClient(self.seed, replicaSet=self.name)
10081007

10091008
def test_get_last_error_defaults(self):
10101009
if not Version.from_client(self.c).at_least(1, 9, 0):
@@ -1045,7 +1044,7 @@ def setUp(self):
10451044
self.seed, self.name = res
10461045

10471046
def test_ship_of_theseus(self):
1048-
c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
1047+
c = MongoClient(self.seed, replicaSet=self.name)
10491048
db = c.pymongo_test
10501049
db.test.insert({}, w=len(c.secondaries) + 1)
10511050
find_one = db.test.find_one
@@ -1134,7 +1133,7 @@ def setUp(self):
11341133
self.seed, self.name = res
11351134

11361135
def test_last_error(self):
1137-
c = MongoReplicaSetClient(self.seed, replicaSet=self.name)
1136+
c = MongoClient(self.seed, replicaSet=self.name)
11381137
wait_until(lambda: c.primary, "discover primary")
11391138
wait_until(lambda: c.secondaries, "discover secondary")
11401139
ha_tools.stepdown_primary()

0 commit comments

Comments
 (0)