Skip to content

Commit 8006a27

Browse files
Ivan Grambergfacebook-github-bot
authored andcommitted
2/N remove :memcached target: switch to MockMemcached() in mcrouter tests
Summary: <public visible description> The goal is to switch all tests consistently to use MockMemcached Reviewed By: alikhtarov Differential Revision: D78342902 fbshipit-source-id: e4dbb946343985bc2b6ba1aa064642d28e24ec1b
1 parent b4e0d37 commit 8006a27

38 files changed

+184
-179
lines changed

third-party/mcrouter/src/mcrouter/test/test_additional_fields.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
# pyre-unsafe
88

9-
from mcrouter.test.MCProcess import Memcached
9+
from mcrouter.test.MCProcess import MockMemcached
1010
from mcrouter.test.McrouterTestCase import McrouterTestCase
1111

1212

1313
class TestAdditionalFields(McrouterTestCase):
1414
config = "./mcrouter/test/test_basic_caret.json"
1515

1616
def setUp(self):
17-
self.mc = self.add_server(Memcached())
17+
self.mc = self.add_server(MockMemcached())
1818
self.mcrouter = self.add_mcrouter(self.config)
1919

2020
def test_basic(self):

third-party/mcrouter/src/mcrouter/test/test_allow_only_gets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
import time
1010

11-
from mcrouter.test.MCProcess import Memcached
11+
from mcrouter.test.MCProcess import MockMemcached
1212
from mcrouter.test.McrouterTestCase import McrouterTestCase
1313

1414

1515
class TestAllowGetsOnly(McrouterTestCase):
1616
config = "./mcrouter/test/mcrouter_test_basic_1_1_1.json"
1717

1818
def setUp(self):
19-
self.mc = self.add_server(Memcached())
19+
self.mc = self.add_server(MockMemcached())
2020
extra_args = ["--allow-only-gets"]
2121
self.mcr = self.add_mcrouter(self.config, extra_args=extra_args)
2222

third-party/mcrouter/src/mcrouter/test/test_bigvalue.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# pyre-unsafe
88

9-
from mcrouter.test.MCProcess import Memcached
9+
from mcrouter.test.MCProcess import MockMemcached
1010
from mcrouter.test.McrouterTestCase import McrouterTestCase
1111

1212
MC_MSG_FLAG_BIG_VALUE = 0x8000
@@ -25,7 +25,7 @@ class TestBigvalue(McrouterTestCase):
2525
]
2626

2727
def setUp(self):
28-
self.add_server(Memcached())
28+
self.add_server(MockMemcached())
2929

3030
def get_mcrouter(self):
3131
return self.add_mcrouter(self.config, extra_args=self.extra_args)

third-party/mcrouter/src/mcrouter/test/test_bucketized_poolroute.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# pyre-unsafe
88

9-
from mcrouter.test.MCProcess import Memcached
9+
from mcrouter.test.MCProcess import MockMemcached
1010
from mcrouter.test.McrouterTestCase import McrouterTestCase
1111

1212

@@ -16,11 +16,11 @@ class TestBucketizedPoolRoute(McrouterTestCase):
1616

1717
def setUp(self):
1818
# The order here corresponds to the order of hosts in the .json
19-
self.mc1 = self.add_server(Memcached())
20-
self.mc2 = self.add_server(Memcached())
21-
self.mc3 = self.add_server(Memcached())
22-
self.mc4 = self.add_server(Memcached())
23-
self.mc5 = self.add_server(Memcached())
19+
self.mc1 = self.add_server(MockMemcached())
20+
self.mc2 = self.add_server(MockMemcached())
21+
self.mc3 = self.add_server(MockMemcached())
22+
self.mc4 = self.add_server(MockMemcached())
23+
self.mc5 = self.add_server(MockMemcached())
2424

2525
def get_mcrouter(self, additional_args=()):
2626
extra_args = self.extra_args[:]
@@ -47,11 +47,11 @@ class TestNonBucketizedPoolRoute(McrouterTestCase):
4747

4848
def setUp(self):
4949
# The order here corresponds to the order of hosts in the .json
50-
self.mc1 = self.add_server(Memcached())
51-
self.mc2 = self.add_server(Memcached())
52-
self.mc3 = self.add_server(Memcached())
53-
self.mc4 = self.add_server(Memcached())
54-
self.mc5 = self.add_server(Memcached())
50+
self.mc1 = self.add_server(MockMemcached())
51+
self.mc2 = self.add_server(MockMemcached())
52+
self.mc3 = self.add_server(MockMemcached())
53+
self.mc4 = self.add_server(MockMemcached())
54+
self.mc5 = self.add_server(MockMemcached())
5555

5656
def get_mcrouter(self, additional_args=()):
5757
extra_args = self.extra_args[:]

third-party/mcrouter/src/mcrouter/test/test_carbonlookaside_route.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import time
1414
from string import Template
1515

16+
from mcrouter.test.MCProcess import MockMemcached
17+
1618
from mcrouter.test.McrouterTestCase import McrouterTestCase
1719

1820

@@ -153,7 +155,7 @@ class TestCarbonLookasideRouteBasic(McrouterTestCase):
153155
extra_args = []
154156

155157
def setUp(self):
156-
self.mc = self.add_server(self.make_memcached())
158+
self.mc = self.add_server(MockMemcached())
157159
self.tmpConfig = CarbonLookasideTmpConfig(
158160
self.prefix, self.ttl, self.mc.getport()
159161
)
@@ -214,7 +216,7 @@ class TestCarbonLookasideRouteExpiry(McrouterTestCase):
214216
extra_args = []
215217

216218
def setUp(self):
217-
self.mc = self.add_server(self.make_memcached())
219+
self.mc = self.add_server(MockMemcached())
218220
self.tmpConfig = CarbonLookasideTmpConfig(
219221
self.prefix, self.ttl, self.mc.getport()
220222
)
@@ -253,7 +255,7 @@ class TestCarbonLookasideRouteNoExpiry(McrouterTestCase):
253255
extra_args = []
254256

255257
def setUp(self):
256-
self.mc = self.add_server(self.make_memcached())
258+
self.mc = self.add_server(MockMemcached())
257259
self.tmpConfig = CarbonLookasideTmpConfig(
258260
self.prefix, self.ttl, self.mc.getport()
259261
)
@@ -291,7 +293,7 @@ class TestCarbonLookasideRouteLeases(McrouterTestCase):
291293
extra_args = []
292294

293295
def setUp(self):
294-
self.mc = self.add_server(self.make_memcached())
296+
self.mc = self.add_server(MockMemcached())
295297
self.tmpConfig = CarbonLookasideTmpConfig(
296298
self.prefix, self.ttl, self.mc.getport(), "true", 10, 10
297299
)
@@ -352,7 +354,7 @@ class TestCarbonLookasideRouteLeasesHotMiss(McrouterTestCase):
352354
extra_args = []
353355

354356
def setUp(self):
355-
self.mc = self.add_server(self.make_memcached())
357+
self.mc = self.add_server(MockMemcached())
356358
self.tmpConfig = CarbonLookasideTmpConfig(
357359
self.prefix, self.ttl, self.mc.getport(), "true", 10, 3, 0, 5000
358360
)
@@ -411,7 +413,7 @@ class TestCarbonLookasideRouteExpiryMsTTLBase(McrouterTestCase):
411413
extra_args = []
412414

413415
def setUp(self):
414-
self.mc = self.add_server(self.make_memcached())
416+
self.mc = self.add_server(MockMemcached())
415417
self.tmpConfig = CarbonLookasideTmpConfig(
416418
self.prefix,
417419
self.ttl,
@@ -451,7 +453,7 @@ class TestCarbonLookasideRouteExpiryMsTTL(McrouterTestCase):
451453
extra_args = []
452454

453455
def setUp(self):
454-
self.mc = self.add_server(self.make_memcached())
456+
self.mc = self.add_server(MockMemcached())
455457
self.tmpConfig = CarbonLookasideTmpConfig(
456458
self.prefix,
457459
self.ttl,

third-party/mcrouter/src/mcrouter/test/test_config_params.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import tempfile
1010
import time
1111

12-
from mcrouter.test.MCProcess import Memcached
12+
from mcrouter.test.MCProcess import MockMemcached
1313
from mcrouter.test.McrouterTestCase import McrouterTestCase
1414

1515

@@ -61,7 +61,7 @@ class TestConstShardHash(McrouterTestCase):
6161
config = "./mcrouter/test/test_config_params.json"
6262

6363
def test_config_params(self):
64-
mc = self.add_server(Memcached())
64+
mc = self.add_server(MockMemcached())
6565
self.port_map = {}
6666
extra_args = ["--config-params", f"PORT:{mc.getport()},POOL:A"]
6767
mcrouter = self.add_mcrouter(self.config, extra_args=extra_args)

third-party/mcrouter/src/mcrouter/test/test_const_shard_hash.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# pyre-unsafe
88

9-
from mcrouter.test.MCProcess import Memcached
9+
from mcrouter.test.MCProcess import MockMemcached
1010
from mcrouter.test.McrouterTestCase import McrouterTestCase
1111

1212

@@ -15,8 +15,8 @@ class TestConstShardHash(McrouterTestCase):
1515
extra_args = []
1616

1717
def test_const_shard_hash(self):
18-
mc1 = self.add_server(Memcached())
19-
mc2 = self.add_server(Memcached())
18+
mc1 = self.add_server(MockMemcached())
19+
mc2 = self.add_server(MockMemcached())
2020
mcrouter = self.add_mcrouter(self.config, extra_args=self.extra_args)
2121

2222
key = "foo:0:test"

third-party/mcrouter/src/mcrouter/test/test_custom_failover.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# pyre-unsafe
88

99

10-
from mcrouter.test.MCProcess import Memcached
10+
from mcrouter.test.MCProcess import MockMemcached
1111
from mcrouter.test.McrouterTestCase import McrouterTestCase
1212
from mcrouter.test.mock_servers import CustomErrorServer
1313

@@ -18,7 +18,7 @@ class TestCustomFailover(McrouterTestCase):
1818

1919
def setUp(self):
2020
self.mc1 = self.add_server(CustomErrorServer())
21-
self.mc2 = self.add_server(Memcached())
21+
self.mc2 = self.add_server(MockMemcached())
2222
self.mcr = self.add_mcrouter(self.config, extra_args=self.extra_args)
2323

2424
def test_failover(self):
@@ -39,7 +39,7 @@ class TestCustomFailoverOverride(McrouterTestCase):
3939

4040
def setUp(self):
4141
self.mc1 = self.add_server(CustomErrorServer())
42-
self.mc2 = self.add_server(Memcached())
42+
self.mc2 = self.add_server(MockMemcached())
4343

4444
self.mcr = self.add_mcrouter(self.config, extra_args=self.extra_args)
4545

third-party/mcrouter/src/mcrouter/test/test_debug_fifos.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import os
1010
import time
1111

12-
from mcrouter.test.MCProcess import Memcached
12+
from mcrouter.test.MCProcess import MockMemcached
1313
from mcrouter.test.McrouterTestCase import McrouterTestCase
1414

1515

@@ -18,7 +18,7 @@ class TestDebugFifos(McrouterTestCase):
1818
extra_args = ["--proxy-threads=1"]
1919

2020
def setUp(self):
21-
self.add_server(Memcached())
21+
self.add_server(MockMemcached())
2222
self.mcrouter = self.add_mcrouter(self.config, extra_args=self.extra_args)
2323

2424
def get_fifo(self, substr):

third-party/mcrouter/src/mcrouter/test/test_latency_injection_route.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from datetime import datetime
1010

11-
from mcrouter.test.MCProcess import Memcached
11+
from mcrouter.test.MCProcess import MockMemcached
1212
from mcrouter.test.McrouterTestCase import McrouterTestCase
1313

1414

@@ -18,7 +18,7 @@ class TestLatencyInjectionRoute(McrouterTestCase):
1818
config_latency_total = "./mcrouter/test/test_latency_injection_total.json"
1919

2020
def setUp(self) -> None:
21-
self.mc = self.add_server(Memcached())
21+
self.mc = self.add_server(MockMemcached())
2222

2323
self.mcrouter_latency_before = self.add_mcrouter(self.config_latency_before)
2424
self.mcrouter_latency_after = self.add_mcrouter(self.config_latency_after)

0 commit comments

Comments
 (0)