launchpad-reviewers team mailing list archive

["Thiago F. Pappacena" <pappacena@xxxxxxxxx>]

Thiago F. Pappacena has proposed merging ~pappacena/turnip:py3-make-check-all-tests into turnip:master.

Commit message:
Adding, on check-python3-partial Makefile rule, the full set of tests passing on py3

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pappacena/turnip/+git/turnip/+merge/394253
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pappacena/turnip:py3-make-check-all-tests into turnip:master.

diff --git a/Makefile b/Makefile
index be2a3e1..8ef2a72 100644
--- a/Makefile
+++ b/Makefile
@@ -101,11 +101,21 @@ check: pip-check test lint check-python3-partial
 # regressions.
 check-python3-partial:
 	$(MAKE) build VENV_ARGS="-p python3" ENV="$(PY3_ENV)"
+	# XXX: Tests not passing on python3 yet:
+	# turnip.pack.tests.test_functional.TestSmartHTTPFrontendFunctional
+	# turnip.pack.tests.test_functional.TestSmartHTTPFrontendWithAuthFunctional
 	$(PY3_ENV)/bin/python -m unittest \
+		turnip.api.tests.test_api \
+		turnip.api.tests.test_helpers \
+		turnip.api.tests.test_store \
+		turnip.pack.tests.test_git \
 		turnip.pack.tests.test_helpers \
 		turnip.pack.tests.test_hookrpc \
+		turnip.pack.tests.test_hooks \
 		turnip.pack.tests.test_http \
 		turnip.pack.tests.test_ssh \
+		turnip.pack.tests.test_functional.TestBackendFunctional \
+		turnip.pack.tests.test_functional.TestGitFrontendFunctional \
 		turnip.pack.tests.test_functional.TestSmartSSHServiceFunctional
 
 check-python3:
diff --git a/turnip/pack/tests/test_git.py b/turnip/pack/tests/test_git.py
index 0e69b3e..57be78c 100644
--- a/turnip/pack/tests/test_git.py
+++ b/turnip/pack/tests/test_git.py
@@ -228,7 +228,7 @@ class TestPackBackendProtocol(TestCase):
 
         full_path = os.path.join(six.ensure_binary(self.root), b'foo.git')
         self.assertEqual(
-            [mock.call(full_path, None, log=mock.ANY)],
+            [mock.call(six.ensure_str(full_path), None, log=mock.ANY)],
             store.init_repo.call_args_list)
         self.assertEqual([], store.delete_repo.call_args_list)
 
@@ -258,10 +258,11 @@ class TestPackBackendProtocol(TestCase):
 
         full_path = os.path.join(six.ensure_binary(self.root), b'foo.git')
         self.assertEqual(
-            [mock.call(full_path, None, log=mock.ANY)],
+            [mock.call(six.ensure_str(full_path), None, log=mock.ANY)],
             store.init_repo.call_args_list)
         self.assertEqual(
-            [mock.call(full_path, )], store.delete_repo.call_args_list)
+            [mock.call(six.ensure_str(full_path), )],
+            store.delete_repo.call_args_list)
 
         auth_params = self.proto.createAuthParams(params)
         self.assertEqual([('foo.git', )],