Fix tests

Author: jonbannister

pytest-devpi-server/_pytest_devpi_server/__init__.py

@@ -88,7 +88,7 @@ def __init__(self, offline=True, debug=False, data=None, user="testuser", passwo
     @property
     def run_cmd(self):
         res = [sys.executable, '-c', 'import sys; from devpi_server.main import main; sys.exit(main())',
-                '--serverdir', self.server_dir,
+                '--serverdir', str(self.server_dir),
                 '--host', self.hostname,
                 '--port', str(self.port)
                 ]
@@ -103,7 +103,7 @@ def api(self, *args):
         """
         client_args = ['devpi']
         client_args.extend(args)
-        client_args.extend(['--clientdir', self.client_dir])
+        client_args.extend(['--clientdir', str(self.client_dir)])
         log.info(' '.join(client_args))
         captured = cStringIO()
         stdout = sys.stdout
@@ -118,10 +118,10 @@ def api(self, *args):
     def pre_setup(self):
         if self.data:
             log.info("Extracting initial server data from {}".format(self.data))
-            zipfile.ZipFile(self.data, 'r').extractall(self.server_dir)
+            zipfile.ZipFile(self.data, 'r').extractall(str(self.server_dir))
         else:
             self.run([os.path.join(sys.exec_prefix, "bin", "devpi-init"),
-                    '--serverdir', self.server_dir,
+                    '--serverdir', str(self.server_dir),
                     ])
 
 

pytest-devpi-server/tests/integration/test_devpi_server.py

@@ -24,7 +24,7 @@ def test_server(devpi_server):
 
 def test_upload(devpi_server):
     pkg_dir = devpi_server.workspace / "pkg"
-    pkg_dir.mkdir_p()
+    pkg_dir.mkdir(exist_ok=True)
     setup_py = pkg_dir / "setup.py"
     setup_py.write_text(
         """

pytest-profiling/tests/integration/test_profile_integration.py

@@ -19,7 +19,7 @@ def virtualenv():
 
         venv.install_package("pytest-cov")
         venv.install_package("pytest-profiling")
-        copy_tree(test_dir, venv.workspace)
+        copy_tree(str(test_dir), str(venv.workspace))
         shutil.rmtree(
             venv.workspace / "tests" / "unit" / "__pycache__", ignore_errors=True
         )

pytest-pyramid-server/pytest_pyramid_server.py

@@ -139,7 +139,7 @@ def start_server(self, env=None):
         """
         print('\n==================================================================================')
         print("Starting wsgiref pyramid test server on host %s port %s" % (self.hostname, self.port))
-        wsgi_app = loadapp('config:' + self.working_config)
+        wsgi_app = loadapp('config:' + str(self.working_config))
         self.server = make_server(self.hostname, self.port, wsgi_app)
         worker = threading.Thread(target=self.server.serve_forever)
         worker.daemon = True

pytest-virtualenv/pytest_virtualenv.py

@@ -4,7 +4,6 @@
 import pathlib
 import re
 import shutil
-import subprocess
 import sys
 from enum import Enum
 
@@ -137,7 +136,7 @@ def __init__(self, env=None, workspace=None, name='.env', python=None, args=None
 
         self.env['VIRTUAL_ENV'] = str(self.virtualenv)
 
-        self.env['PATH'] = str(self.python.dirname()) + ((os.path.pathsep + self.env["PATH"])
+        self.env['PATH'] = str(os.path.dirname(self.python)) + ((os.path.pathsep + self.env["PATH"])
                                                          if "PATH" in self.env else "")
         if 'PYTHONPATH' in self.env:
             del(self.env['PYTHONPATH'])