remove a few unecessary lines

This commit is contained in:
diginc 2016-07-16 16:02:49 -05:00
parent d2024cda37
commit 4225e4cd7c
2 changed files with 0 additions and 9 deletions

View File

@ -17,11 +17,8 @@ def TestinfraBackend(request):
def teardown():
check_output("docker rm -f %s", docker_id)
# Destroy the container at the end of the fixture life
request.addfinalizer(teardown)
# Return a dynamic created backend
return testinfra.get_backend("docker://" + docker_id)
@ -47,10 +44,6 @@ def pytest_generate_tests(metafunc):
for img in images:
docker_run_args.append('{} {} {}'.format(" ".join(docker_args),
img, command))
# If the test has a destructive marker, we scope TestinfraBackend
# at function level (i.e. executing for each test). If not we scope
# at session level (i.e. all tests will share the same container)
if getattr(metafunc.function, "persistent", None) is not None:
scope = "session"
else:

View File

@ -1,7 +1,5 @@
import pytest
import testinfra
# This test will run on both debian:jessie and centos:7 images
def test_ServerIP_missing_env_triggers_error(Command):
start = Command.run('/start.sh')
error_msg = "ERROR: To function correctly you must pass an environment variables of 'ServerIP' into the docker container"