Merge ~pappacena/turnip:py3-functional-tests-initialization into turnip:master

[Thiago F. Pappacena]

Fixing some functional tests initialization py3 compatibilities

[Colin Watson (cjwatson)]

review: Approve

7f7d4f9... by Thiago F. Pappacena on 2020-11-14

Merge branch 'master' into py3-functional-tests-initialization

d46d89c... by Thiago F. Pappacena on 2020-11-14

Fixing incompatibility with py2 and non-binary file paths

[Thiago F. Pappacena (pappacena)]

Thanks for the comments.

All should be fixed now. Now TestSmartSSHServiceFunctional and some other smaller functional tests run on both py2 and py3! :-)

[Colin Watson (cjwatson)]

review: Approve

diff --git a/turnip/pack/tests/fake_servers.py b/turnip/pack/tests/fake_servers.py
index 9130614..7087da9 100644
--- a/turnip/pack/tests/fake_servers.py
+++ b/turnip/pack/tests/fake_servers.py
@@ -82,9 +82,10 @@ class FakeVirtInfoService(xmlrpc.XMLRPC):
         self.abort_repo_creation_call_args = []
 
     def getInternalPath(self, pathname):
-        if pathname.startswith('/+rw'):
+        pathname = six.ensure_binary(pathname)
+        if pathname.startswith(b'/+rw'):
             pathname = pathname[4:]
-        return hashlib.sha256(six.ensure_binary(pathname)).hexdigest()
+        return hashlib.sha256(pathname).hexdigest()
 
     def xmlrpc_translatePath(self, pathname, permission, auth_params):
         if self.require_auth and 'user' not in auth_params:
diff --git a/turnip/pack/tests/test_functional.py b/turnip/pack/tests/test_functional.py
index 97a99d2..c044968 100644
--- a/turnip/pack/tests/test_functional.py
+++ b/turnip/pack/tests/test_functional.py
@@ -188,7 +188,7 @@ class FunctionalTestMixin(WithScenarios):
 
     def assertStatsdSuccess(self, repo, command):
         metrics = ['max_rss', 'system_time', 'user_time']
-        repository = re.sub('[^0-9a-zA-Z]+', '-', repo)
+        repository = re.sub('[^0-9a-zA-Z]+', '-', six.ensure_str(repo))
         self.assertThat(self.statsd_client.vals, MatchesDict({
             u'git,operation={},repo={},env={},metric={}'
             .format(
@@ -934,9 +934,10 @@ class TestSmartSSHServiceFunctional(FrontendFunctionalTestMixin, TestCase):
     def setUp(self):
         yield super(TestSmartSSHServiceFunctional, self).setUp()
 
-        config = os.path.join(self.root, "ssh-config")
-        known_hosts = os.path.join(self.root, "known_hosts")
-        private_key = os.path.join(self.root, "ssh-key")
+        root = six.ensure_text(self.root)
+        config = os.path.join(root, "ssh-config")
+        known_hosts = os.path.join(root, "known_hosts")
+        private_key = os.path.join(root, "ssh-key")
         shutil.copy2(os.path.join(self.data_dir, "ssh-key"), private_key)
         os.chmod(private_key, stat.S_IRUSR | stat.S_IWUSR)
         public_key = os.path.join(self.data_dir, "ssh-key.pub")
@@ -946,7 +947,7 @@ class TestSmartSSHServiceFunctional(FrontendFunctionalTestMixin, TestCase):
             print("StrictHostKeyChecking no", file=config_file)
             print("User example", file=config_file)
             print("UserKnownHostsFile %s" % known_hosts, file=config_file)
-        git_ssh = os.path.join(self.root, "ssh-wrapper")
+        git_ssh = os.path.join(root, "ssh-wrapper")
         with open(git_ssh, "w") as git_ssh_file:
             print('#! /bin/sh', file=git_ssh_file)
             print('ssh -F %s "$@"' % config, file=git_ssh_file)
@@ -955,22 +956,24 @@ class TestSmartSSHServiceFunctional(FrontendFunctionalTestMixin, TestCase):
             stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
         os.chmod(git_ssh, new_mode)
         self.useFixture(EnvironmentVariable("GIT_SSH", git_ssh))
+        self.useFixture(EnvironmentVariable("GIT_SSH_VARIANT", "ssh"))
 
         self.authserver.addSSHKey("example", public_key)
 
         # We run a service connecting to the backend and authserver servers
         # started by the mixin.
-        private_host_key = os.path.join(self.root, "ssh-host-key")
+        private_host_key = os.path.join(root, "ssh-host-key")
         shutil.copy2(
             os.path.join(self.data_dir, "ssh-host-key"), private_host_key)
         os.chmod(private_host_key, stat.S_IRUSR | stat.S_IWUSR)
         public_host_key = os.path.join(self.data_dir, "ssh-host-key.pub")
+
         self.service = SmartSSHService(
             b'localhost', self.virt_port, self.authserver_url,
             private_key_path=private_host_key, public_key_path=public_host_key,
             main_log="turnip", access_log="turnip.access",
-            access_log_path=os.path.join(self.root, "access.log"),
-            strport=b'tcp:0', moduli_path="/etc/ssh/moduli")
+            access_log_path=os.path.join(root, "access.log"),
+            strport=six.ensure_str('tcp:0'), moduli_path="/etc/ssh/moduli")
         self.service.startService()
         self.addCleanup(self.service.stopService)
         socket = self.service.service._waitingForPort.result.socket