##// END OF EJS Templates
tests: use WARN loglevel by default, and add --test-loglevel flag to change this....
marcink -
r1123:c96fec20 default
parent child Browse files
Show More
@@ -48,6 +48,9 b' def _parse_json(value):'
48
48
49
49
50 def pytest_addoption(parser):
50 def pytest_addoption(parser):
51 parser.addoption(
52 '--test-loglevel', dest='test_loglevel',
53 help="Set default Logging level for tests, warn (default), info, debug")
51 group = parser.getgroup('pylons')
54 group = parser.getgroup('pylons')
52 group.addoption(
55 group.addoption(
53 '--with-pylons', dest='pylons_config',
56 '--with-pylons', dest='pylons_config',
@@ -187,6 +190,11 b' def _use_vcs_http_server(config):'
187 return protocol == 'http'
190 return protocol == 'http'
188
191
189
192
193 def _use_log_level(config):
194 level = config.getoption('test_loglevel') or 'warn'
195 return level.upper()
196
197
190 class VCSServer(object):
198 class VCSServer(object):
191 """
199 """
192 Represents a running VCSServer instance.
200 Represents a running VCSServer instance.
@@ -281,6 +289,7 b' class HttpVCSServer(VCSServer):'
281 @pytest.fixture(scope='session')
289 @pytest.fixture(scope='session')
282 def pylons_config(request, tmpdir_factory, rcserver_port, vcsserver_port):
290 def pylons_config(request, tmpdir_factory, rcserver_port, vcsserver_port):
283 option_name = 'pylons_config'
291 option_name = 'pylons_config'
292 log_level = _use_log_level(request.config)
284
293
285 overrides = [
294 overrides = [
286 {'server:main': {'port': rcserver_port}},
295 {'server:main': {'port': rcserver_port}},
@@ -291,6 +300,13 b' def pylons_config(request, tmpdir_factor'
291 # off in the INI file.
300 # off in the INI file.
292 'vcs.start_server': 'false',
301 'vcs.start_server': 'false',
293 }},
302 }},
303
304 {'handler_console': {
305 'class ': 'StreamHandler',
306 'args ': '(sys.stderr,)',
307 'level': log_level,
308 }},
309
294 ]
310 ]
295 if _use_vcs_http_server(request.config):
311 if _use_vcs_http_server(request.config):
296 overrides.append({
312 overrides.append({
General Comments 0
You need to be logged in to leave comments. Login now