engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pytest: Use http as default backend in pytest configuration.

Browse source
This commit is contained in:
Martin Bornhold 2016-10-04 14:37:48 +02:00
parent 8279f376a9
commit 30d2e31229
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pytest.ini
View file

@ -1,9 +1,9 @@
[pytest]
testpaths = ./rhodecode
pylons_config = test.ini
vcsserver_protocol = pyro4
vcsserver_config = rhodecode/tests/vcsserver.ini
vcsserver_config_http = rhodecode/tests/vcsserver_pyramid.ini
vcsserver_protocol = http
vcsserver_config_pyro4 = rhodecode/tests/vcsserver_pyro4.ini
vcsserver_config_http = rhodecode/tests/vcsserver_http.ini
norecursedirs = tests/scripts
addopts = -k "not _BaseTest"
markers =

8
rhodecode/tests/pylons_plugin.py
View file

@ -68,7 +68,7 @@ def pytest_addoption(parser):
'--without-vcsserver', dest='with_vcsserver', action='store_false',
help="Do not start the VCSServer in a background process.")
vcsgroup.addoption(
'--with-vcsserver', dest='vcsserver_config',
'--with-vcsserver', dest='vcsserver_config_pyro4',
help="Start the VCSServer with the specified config file.")
vcsgroup.addoption(
'--with-vcsserver-http', dest='vcsserver_config_http',
@ -91,7 +91,7 @@ def pytest_addoption(parser):
"against an already running server and random ports cause "
"trouble."))
parser.addini(
'vcsserver_config',
'vcsserver_config_pyro4',
"Start the VCSServer with the specified config file.")
parser.addini(
'vcsserver_config_http',
@ -151,7 +151,7 @@ def vcsserver_factory(tmpdir_factory):
overrides.append(platform_override)
option_name = (
'vcsserver_config_http' if use_http else 'vcsserver_config')
'vcsserver_config_http' if use_http else 'vcsserver_config_pyro4')
override_option_name = 'vcsserver_config_override'
config_file = get_config(
request.config, option_name=option_name,
@ -183,7 +183,7 @@ def _use_vcs_http_server(config):
protocol = (
config.getoption(protocol_option) or
config.getini(protocol_option) or
'pyro4')
'http')
return protocol == 'http'