# HG changeset patch
# User Johannes Bornhold <johannes@rhodecode.com>
# Date 2016-09-20 12:01:42
# Node ID 43fb99bfc2638a48e2851dc221bba8e8ab8bfea4
# Parent  34e1c499d2d333d8e42c84e923dcbba1233f8a56

tests: Fix --without-vcsserver parameter

Ensuring now that we always disable the vcsserver auto start for the test suite,
since the test suite bootstraps its own vcsserver process.

Also enhanced TestINI.

diff --git a/rhodecode/tests/fixture.py b/rhodecode/tests/fixture.py
--- a/rhodecode/tests/fixture.py
+++ b/rhodecode/tests/fixture.py
@@ -76,8 +76,8 @@ class TestINI(object):
 
         for data in self.ini_params:
             section, ini_params = data.items()[0]
-            key, val = ini_params.items()[0]
-            config[section][key] = val
+            for key, val in ini_params.items():
+                config[section][key] = val
         with tempfile.NamedTemporaryFile(
                 prefix=self.new_path_prefix, suffix='.ini', dir=self._dir,
                 delete=False) as new_ini_file:
diff --git a/rhodecode/tests/pylons_plugin.py b/rhodecode/tests/pylons_plugin.py
--- a/rhodecode/tests/pylons_plugin.py
+++ b/rhodecode/tests/pylons_plugin.py
@@ -283,7 +283,14 @@ def pylons_config(request, tmpdir_factor
 
     overrides = [
         {'server:main': {'port': rcserver_port}},
-        {'app:main': {'vcs.server': 'localhost:%s' % vcsserver_port}}]
+        {'app:main': {
+            'vcs.server': 'localhost:%s' % vcsserver_port,
+            # johbo: We will always start the VCSServer on our own based on the
+            # fixtures of the test cases. For the test run it must always be
+            # off in the INI file.
+            'vcs.start_server': 'false',
+        }},
+    ]
     if _use_vcs_http_server(request.config):
         overrides.append({'app:main': {'vcs.server.protocol': 'http'}})