Commit efb9d2b6 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

OmnibusHeptapod: new run option to use this new class

This brings all the pieces together

--HG--
branch : stable
parent 848e9557d188
......@@ -12,6 +12,7 @@ from tests.utils.group import Group
from tests.utils.user import User
from tests.utils.heptapod import (
Heptapod,
OmnibusHeptapod,
DockerHeptapod,
SourceHeptapod,
GdkHeptapod,
......@@ -37,6 +38,9 @@ def pytest_addoption(parser):
"and filesystem manipulations."
"This mode needs rbenv or equivalent to be active."
)
parser.addoption('--heptapod-omnibus', action="store_true",
help="Test a Heptapod Omnibus by running the tests "
"as root on the same system ")
parser.addoption('--heptapod-remote', action='store_true',
help="Test a remote server. This means that no "
"direct command nor file system access is possible "
......@@ -106,7 +110,8 @@ def pytest_collection_modifyitems(config, items):
remote = config.getoption('heptapod_remote')
source_install = config.getoption('heptapod_source_install')
gdk = config.getoption('heptapod_gdk')
docker = not (gdk or source_install or remote)
omnibus = config.getoption('heptapod_omnibus')
docker = not (gdk or source_install or remote or omnibus)
for item in items:
if remote and "fs_access" in item.keywords:
......@@ -162,6 +167,8 @@ def heptapod(pytestconfig):
**common)
elif pytestconfig.getoption('heptapod_remote'):
heptapod = Heptapod(**common)
elif pytestconfig.getoption('heptapod_omnibus'):
heptapod = OmnibusHeptapod(**common)
else:
ct = pytestconfig.getoption('heptapod_docker_container')
heptapod = DockerHeptapod(docker_container=ct, **common)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment