##// END OF EJS Templates
tests: Fix --without-vcsserver parameter...
johbo -
r816:43fb99bf default
parent child Browse files
Show More
@@ -76,7 +76,7 b' class TestINI(object):'
76
76
77 for data in self.ini_params:
77 for data in self.ini_params:
78 section, ini_params = data.items()[0]
78 section, ini_params = data.items()[0]
79 key, val = ini_params.items()[0]
79 for key, val in ini_params.items():
80 config[section][key] = val
80 config[section][key] = val
81 with tempfile.NamedTemporaryFile(
81 with tempfile.NamedTemporaryFile(
82 prefix=self.new_path_prefix, suffix='.ini', dir=self._dir,
82 prefix=self.new_path_prefix, suffix='.ini', dir=self._dir,
@@ -283,7 +283,14 b' def pylons_config(request, tmpdir_factor'
283
283
284 overrides = [
284 overrides = [
285 {'server:main': {'port': rcserver_port}},
285 {'server:main': {'port': rcserver_port}},
286 {'app:main': {'vcs.server': 'localhost:%s' % vcsserver_port}}]
286 {'app:main': {
287 'vcs.server': 'localhost:%s' % vcsserver_port,
288 # johbo: We will always start the VCSServer on our own based on the
289 # fixtures of the test cases. For the test run it must always be
290 # off in the INI file.
291 'vcs.start_server': 'false',
292 }},
293 ]
287 if _use_vcs_http_server(request.config):
294 if _use_vcs_http_server(request.config):
288 overrides.append({'app:main': {'vcs.server.protocol': 'http'}})
295 overrides.append({'app:main': {'vcs.server.protocol': 'http'}})
289
296
General Comments 0
You need to be logged in to leave comments. Login now