tests: refactor TestINI to different name so it doesn't confuse pytest.

vcsserver/tests/fixture.py

@@ -1,71 +1,71 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
 # Copyright (C) 2014-2016 RodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
 import os
 import shutil
 import tempfile
 
 import configobj
 
 
-class TestINI(object):
+class ContextINI(object):
     """
     Allows to create a new test.ini file as a copy of existing one with edited
     data. If existing file is not present, it creates a new one. Example usage::
 
         with TestINI('test.ini', [{'section': {'key': 'val'}}]) as new_test_ini_path:
             print 'vcsserver --config=%s' % new_test_ini
     """
 
     def __init__(self, ini_file_path, ini_params, new_file_prefix=None,
                  destroy=True):
         self.ini_file_path = ini_file_path
         self.ini_params = ini_params
         self.new_path = None
         self.new_path_prefix = new_file_prefix or 'test'
         self.destroy = destroy
 
     def __enter__(self):
         _, pref = tempfile.mkstemp()
         loc = tempfile.gettempdir()
         self.new_path = os.path.join(loc, '{}_{}_{}'.format(
             pref, self.new_path_prefix, self.ini_file_path))
 
         # copy ini file and modify according to the params, if we re-use a file
         if os.path.isfile(self.ini_file_path):
             shutil.copy(self.ini_file_path, self.new_path)
         else:
             # create new dump file for configObj to write to.
             with open(self.new_path, 'wb'):
                 pass
 
         config = configobj.ConfigObj(
             self.new_path, file_error=True, write_empty_values=True)
 
         for data in self.ini_params:
             section, ini_params = data.items()[0]
             key, val = ini_params.items()[0]
             if section not in config:
                 config[section] = {}
             config[section][key] = val
 
         config.write()
         return self.new_path
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if self.destroy:
             os.remove(self.new_path)

vcsserver/tests/test_vcsserver.py

@@ -1,132 +1,132 b''
 # RhodeCode VCSServer provides access to different vcs backends via network.
 # Copyright (C) 2014-2016 RodeCode GmbH
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
 import subprocess
 import StringIO
 import time
 
 import pytest
 
-from fixture import TestINI
+from fixture import ContextINI
 
 
 @pytest.mark.parametrize("arguments, expected_texts", [
     (['--threadpool=192'], [
         'threadpool_size: 192',
         'worker pool of size 192 created',
         'Threadpool size set to 192']),
     (['--locale=fake'], [
         'Cannot set locale, not configuring the locale system']),
     (['--timeout=5'], [
         'Timeout for RPC calls set to 5.0 seconds']),
     (['--log-level=info'], [
         'log_level:       info']),
     (['--port={port}'], [
         'port:            {port}',
         'created daemon on localhost:{port}']),
     (['--host=127.0.0.1', '--port={port}'], [
         'port:            {port}',
         'host:            127.0.0.1',
         'created daemon on 127.0.0.1:{port}']),
     (['--config=/bad/file'], ['OSError: File /bad/file does not exist']),
 ])
 def test_vcsserver_calls(arguments, expected_texts, vcsserver_port):
     port_argument = '--port={port}'
     if port_argument not in arguments:
         arguments.append(port_argument)
     arguments = _replace_port(arguments, vcsserver_port)
     expected_texts = _replace_port(expected_texts, vcsserver_port)
     output = call_vcs_server_with_arguments(arguments)
     for text in expected_texts:
         assert text in output
 
 
 def _replace_port(values, port):
     return [value.format(port=port) for value in values]
 
 
 def test_vcsserver_with_config(vcsserver_port):
     ini_def = [
         {'DEFAULT': {'host': '127.0.0.1'}},
         {'DEFAULT': {'threadpool_size': '111'}},
         {'DEFAULT': {'port': vcsserver_port}},
     ]
 
-    with TestINI('test.ini', ini_def) as new_test_ini_path:
+    with ContextINI('test.ini', ini_def) as new_test_ini_path:
         output = call_vcs_server_with_arguments(
             ['--config=' + new_test_ini_path])
 
         expected_texts = [
             'host:            127.0.0.1',
             'Threadpool size set to 111',
         ]
         for text in expected_texts:
             assert text in output
 
 
 def test_vcsserver_with_config_cli_overwrite(vcsserver_port):
     ini_def = [
         {'DEFAULT': {'host': '127.0.0.1'}},
         {'DEFAULT': {'port': vcsserver_port}},
         {'DEFAULT': {'threadpool_size': '111'}},
         {'DEFAULT': {'timeout': '0'}},
     ]
-    with TestINI('test.ini', ini_def) as new_test_ini_path:
+    with ContextINI('test.ini', ini_def) as new_test_ini_path:
         output = call_vcs_server_with_arguments([
             '--config=' + new_test_ini_path,
             '--host=128.0.0.1',
             '--threadpool=256',
             '--timeout=5'])
         expected_texts = [
             'host:            128.0.0.1',
             'Threadpool size set to 256',
             'Timeout for RPC calls set to 5.0 seconds',
         ]
         for text in expected_texts:
             assert text in output
 
 
 def call_vcs_server_with_arguments(args):
     vcs = subprocess.Popen(
         ["vcsserver"] + args,
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
     output = read_output_until(
         "Starting vcsserver.main", vcs.stdout)
     vcs.terminate()
     return output
 
 
 def call_vcs_server_with_non_existing_config_file(args):
     vcs = subprocess.Popen(
         ["vcsserver", "--config=/tmp/bad"] + args,
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     output = read_output_until(
         "Starting vcsserver.main", vcs.stdout)
     vcs.terminate()
     return output
 
 
 def read_output_until(expected, source, timeout=5):
     ts = time.time()
     buf = StringIO.StringIO()
     while time.time() - ts < timeout:
         line = source.readline()
         buf.write(line)
         if expected in line:
             break
     return buf.getvalue()