run tests in memory instead of subprocesses
greatly improves error/failure reporting
@@ -7,10 +7,14 @@ and then ./verify is run inside the built container. It should
return a non-zero exit code for the test to be considered a
success.
"""
+
+import os
+import shlex
+
import pytest
-import subprocess
import yaml
-import shlex
+
+from repo2docker.app import Repo2Docker
def pytest_collect_file(parent, path):
@@ -20,22 +24,36 @@ def pytest_collect_file(parent, path):
return RemoteRepoList(path, parent)
-class LocalRepo(pytest.File):
- def collect(self):
- yield LocalRepoTest(self.fspath.basename, self, self.fspath)
+def make_test_func(args):
+ """Generate a test function that runs repo2docker"""
+ def test():
+ app = Repo2Docker()
+ app.initialize(args)
+ app.start()
+ return test
+
+
+class Repo2DockerTest(pytest.Function):
+ """A pytest.Item for running repo2docker"""
+ def __init__(self, name, parent, args):
+ f = parent.obj = make_test_func(args)
+ super().__init__(name, parent, callobj=f)
+ self.save_cwd = os.getcwd()
+ def reportinfo(self):
+ return self.parent.fspath, None, ""
-class LocalRepoTest(pytest.Item):
- def __init__(self, name, parent, path):
- super().__init__(name, parent)
- self.path = path
+ def teardown(self):
+ super().teardown()
+ os.chdir(self.save_cwd)
- def runtest(self):
- subprocess.check_call([
- 'jupyter-repo2docker',
- str(self.path.dirname),
- './verify'
- ])
+
+class LocalRepo(pytest.File):
+ def collect(self):
+ yield Repo2DockerTest(
+ self.fspath.basename, self,
+ args=[self.fspath.dirname, './verify'],
+ )
class RemoteRepoList(pytest.File):
@@ -43,21 +61,11 @@ class RemoteRepoList(pytest.File):
with self.fspath.open() as f:
repos = yaml.safe_load(f)
for repo in repos:
- yield RemoteRepoTest(repo['name'], self, repo['url'],
- repo['ref'], repo['verify'])
-
-
-class RemoteRepoTest(pytest.Item):
- def __init__(self, name, parent, url, ref, verify):
- super().__init__(name, parent)
- self.url = url
- self.ref = ref
- self.verify = verify
-
- def runtest(self):
- subprocess.check_call([
- 'jupyter-repo2docker',
- '--ref', self.ref,
- self.url,
+ yield Repo2DockerTest(
+ repo['name'], self,
+ args=[
+ '--ref', repo['ref'],
+ repo['url'],
'--',
- ] + shlex.split(self.verify))
+ ] + shlex.split(repo['verify']),
+ )
