5/N remove:memcached target: switch mcrouter/facebook testcases to ucache

Summary:
The goal is to remove the //memcache/memcached:memcached target and Memcache Server related code.
Previous change D79131814 switched all memcache/* testcases to ucache

this change:

-  does the same for the mcrouter/facebook* tests
- achieves clear separation between OSS mcrouter tests that use MockMemcached and facebook tests that use ucache via memcache/test/lib.py utility class

an overview diagram: https://internalfb.com/excalidraw/EX522861

next steps:
 - drop usages of //memcache/memcached:memcached target

Reviewed By: alikhtarov

Differential Revision: D79258805

fbshipit-source-id: 12b4567f34488e75eb706a473f3270edcba721d0

Author: Ivan Gramberg

mcrouter/test/MCProcess.py

@@ -154,17 +154,12 @@ def __init__(
             self.addr = ("localhost", port)
             self.port = port
             self.addr_family = socket.AF_INET
-        memcached = False
-        if cmd is not None and "memcached" in cmd[0]:
-            memcached = True
 
         if base_dir is None:
             base_dir = BaseDirectory("MCProcess")
 
         ProcessBase.__init__(self, cmd, base_dir, junk_fill, pass_fds=pass_fds)
-        # memcached could take little longer to initialize
-        if memcached:
-            time.sleep(3)
+
         self.max_retries = 20 if max_retries is None else max_retries
         self.deletes = 0
         self.others = 0
@@ -1022,92 +1017,6 @@ def getport(self):
         return self.thriftPort if self.mcrouterUseThrift else self.asyncPort
 
 
-class Memcached(MCProcess):
-    ssl_port = None
-
-    def __init__(self, port=None, ssl_port=None, extra_args=None):
-        args = [McrouterGlobals.binPath("prodmc")]
-        listen_sock = None
-        pass_fds = []
-
-        # if mockmc is used here, we initialize the same way as MockMemcached
-        if McrouterGlobals.binPath("mockmc") == args[0]:
-            if port is None:
-                listen_sock = create_listen_socket()
-                port = listen_sock.getsockname()[1]
-                listen_sock_fd = listen_sock.fileno()
-                args.extend(["-t", str(listen_sock_fd)])
-                pass_fds.append(listen_sock_fd)
-            else:
-                args.extend(["-P", str(port)])
-
-            MCProcess.__init__(self, args, port, pass_fds=pass_fds)
-
-            if listen_sock is not None:
-                listen_sock.close()
-        else:
-            args.extend(
-                [
-                    "-A",
-                    "-g",
-                    "-t",
-                    "1",
-                    "--enable_hash_aliases",
-                    "--enable_unchecked_l1_sentinel_reads",
-                    "--items_reaper_interval_secs=1",
-                    "--ini_hashpower=16",
-                    "--num_listening_sockets=1",
-                ]
-            )
-            if extra_args:
-                args.extend(extra_args)
-            if port is None:
-                listen_sock = create_listen_socket()
-                port = listen_sock.getsockname()[1]
-                listen_sock_fd = listen_sock.fileno()
-                args.extend(["--listen_sock_fd", str(listen_sock_fd)])
-                pass_fds.append(listen_sock_fd)
-            else:
-                args.extend(["-p", str(port)])
-
-            # Create a listen thrift socket to avoid port collision.
-            # Not used in actual ASCII tests
-            thrift_listen_sock = create_listen_socket()
-            thrift_listen_sock_fd = thrift_listen_sock.fileno()
-            args.extend(["--thrift_listen_sock_fd", str(thrift_listen_sock_fd)])
-            pass_fds.append(thrift_listen_sock_fd)
-            thrift_port = thrift_listen_sock.getsockname()[1]
-
-            if ssl_port:
-                self.ssl_port = ssl_port
-                args.extend(["--ssl_port", str(self.ssl_port)])
-
-            MCProcess.__init__(
-                self, args, port, pass_fds=pass_fds, thriftPort=thrift_port
-            )
-
-            thrift_listen_sock.close()
-
-            if listen_sock is not None:
-                listen_sock.close()
-
-            # delay here until the server goes up
-            self.ensure_connected()
-            tries = 10
-            s = self.stats()
-            while (not s or len(s) == 0) and tries > 0:
-                # Note, we need to reconnect, because it's possible the
-                # server is still going to process previous requests.
-                self.ensure_connected()
-                s = self.stats()
-                time.sleep(0.5)
-                tries -= 1
-            self.disconnect()
-
-    def getsslport(self):
-        return self.ssl_port
-
-
 class Mcpiper(ProcessBase):
     def __init__(self, fifos_dir, extra_args=None):
         base_dir = BaseDirectory("mcpiper")

mcrouter/test/McrouterTestCase.py

@@ -10,13 +10,12 @@
 import time
 import unittest
 
-from mcrouter.test.MCProcess import Mcrouter, Memcached, MockMemcached
+from mcrouter.test.MCProcess import Mcrouter, MockMemcached
 
 
 class McrouterTestCase(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.use_mock_mc = False
 
     def ensureClassVariables(self):
         if "open_servers" not in self.__dict__:
@@ -50,6 +49,9 @@ def wait_noempty_dir(cls, root, *, retries=0, interval=1):
                 return False
             time.sleep(interval)
 
+    def memcached_args(self, unused_tmp_dir):
+        return []
+
     def add_server(self, server, logical_port=None, sr_routing=False):
         self.ensureClassVariables()
         server.ensure_connected()
@@ -112,7 +114,7 @@ def add_mcrouter(
         return mcrouter
 
     def make_memcached(self):
-        return MockMemcached() if self.use_mock_mc else Memcached()
+        return MockMemcached()
 
     def get_open_ports(self):
         self.ensureClassVariables()

mcrouter/test/test_mcrouter_basic.py

@@ -165,7 +165,6 @@ def test_set_exptime(self):
 class TestMcrouterBasicTouch(TestMcrouterBasicBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.use_mock_mc = True
 
     def test_basic_touch(self):
         mcr = self.get_mcrouter()
@@ -271,7 +270,6 @@ def test_basic_invalid_route(self):
 class TestMcrouterInvalidRouteAppendPrepend(TestMcrouterInvalidRouteBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.use_mock_mc = True
 
     def test_basic_invalid_route(self):
         mcr = self.get_mcrouter()
@@ -402,7 +400,6 @@ def test_basic_all_sync(self):
 class TestBasicAllSyncAppendPrependTouch(TestBasicAllSyncBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.use_mock_mc = True
 
     def get_mcrouter(self):
         return self.add_mcrouter(self.config, extra_args=self.extra_args)

mcrouter/test/test_noreply.py

@@ -64,7 +64,6 @@ def test_arith_noreply(self):
 class TestNoReplyAppendPrepend(TestNoReplyBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.use_mock_mc = True
 
     def test_affix_noreply(self):
         mcrouter = self.get_mcrouter()

mcrouter/test/test_warmup2.py

@@ -114,7 +114,6 @@ def test_warmup_metaget(self):
 class TestWarmup2AppendPrependTouch(TestWarmup2):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.use_mock_mc = True
 
     def test_warmup_append_prepend(self):
         k = "key"