From 2d369c6482fa940121462f7574bfc7985201520e Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 15 Oct 2018 21:38:14 -0500
Subject: fix scaffold tests

---
 src/pyramid/scaffolds/tests.py |  4 ++--
 tox.ini                        | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pyramid/scaffolds/tests.py b/src/pyramid/scaffolds/tests.py
index cb8842dbe..8ed2f2348 100644
--- a/src/pyramid/scaffolds/tests.py
+++ b/src/pyramid/scaffolds/tests.py
@@ -19,7 +19,7 @@ class TemplateTest(object):
         logger = Logger([(Logger.level_for_integer(2), sys.stdout)])
         virtualenv.logger = logger
         virtualenv.create_environment(
-            directory, site_packages=False, clear=False, unzip_setuptools=True
+            directory, site_packages=False, clear=False
         )
 
     def install(self, tmpl_name):  # pragma: no cover
@@ -28,7 +28,7 @@ class TemplateTest(object):
             self.directory = tempfile.mkdtemp()
             self.make_venv(self.directory)
             here = os.path.abspath(os.path.dirname(__file__))
-            os.chdir(os.path.dirname(os.path.dirname(here)))
+            os.chdir(os.path.dirname(os.path.dirname(os.path.dirname(here))))
             pip = os.path.join(self.directory, 'bin', 'pip')
             subprocess.check_call([pip, 'install', '-e', '.'])
             os.chdir(self.directory)
diff --git a/tox.ini b/tox.ini
index f5152cb99..cda08f853 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,37 +28,37 @@ extras =
 [testenv:py27-scaffolds]
 basepython = python2.7
 commands =
-    python pyramid/scaffolds/tests.py
+    python src/pyramid/scaffolds/tests.py
 deps = virtualenv
 
 [testenv:py34-scaffolds]
 basepython = python3.4
 commands =
-    python pyramid/scaffolds/tests.py
+    python src/pyramid/scaffolds/tests.py
 deps = virtualenv
 
 [testenv:py35-scaffolds]
 basepython = python3.5
 commands =
-    python pyramid/scaffolds/tests.py
+    python src/pyramid/scaffolds/tests.py
 deps = virtualenv
 
 [testenv:py36-scaffolds]
 basepython = python3.6
 commands =
-    python pyramid/scaffolds/tests.py
+    python src/pyramid/scaffolds/tests.py
 deps = virtualenv
 
 [testenv:py37-scaffolds]
 basepython = python3.7
 commands =
-    python pyramid/scaffolds/tests.py
+    python src/pyramid/scaffolds/tests.py
 deps = virtualenv
 
 [testenv:pypy-scaffolds]
 basepython = pypy
 commands =
-    python pyramid/scaffolds/tests.py
+    python src/pyramid/scaffolds/tests.py
 deps = virtualenv
 
 [testenv:lint]
-- 
cgit v1.2.3