Merge pull request dbcli#431 from dbcli/tsroten/clean_up_config

Clean up testing config files.

Author: meeuw

.coveragerc

@@ -1,3 +1,3 @@
 [run]
-parallel=True
-source=mycli
+parallel = True
+source = mycli

.travis.yml

@@ -7,15 +7,14 @@ python:
   - "3.6"
 
 install:
-  - pip install PyMySQL . pytest mock codecov pexpect behave
+  - pip install PyMySQL pytest mock codecov pexpect behave pytest-cov
   - pip install git+https://github.com/hayd/pep8radius.git
+  - pip install -e .
 
 script:
   - set -e
-  - coverage run --source mycli -m py.test
-  - cd test
-  - behave
-  - cd ..
+  - py.test --cov-report= --cov=mycli
+  - behave test/features
   # check for pep8 errors, only looking at branch vs master. If there are errors, show diff and return an error code.
   - pep8radius master --docformatter --error-status || ( pep8radius master --docformatter --diff; false )
   - set +e
@@ -30,4 +29,3 @@ notifications:
       - YOUR_WEBHOOK_URL
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false

MANIFEST.in

@@ -1,2 +1,6 @@
 include LICENSE.txt *.md *.rst requirements-dev.txt screenshots/*
-include conftest.py .coveragerc pytest.ini test tox.ini
+include .coveragerc tox.ini
+recursive-include test *.cnf
+recursive-include test *.feature
+recursive-include test *.py
+recursive-include test *.txt

conftest.py

@@ -56,7 +56,7 @@
 # Query tuples are used for maintaining history
 Query = namedtuple('Query', ['query', 'successful', 'mutating'])
 
-PACKAGE_ROOT = os.path.dirname(__file__)
+PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 
 # no-op logging handler
 class NullHandler(logging.Handler):

mycli/main.py

@@ -1,5 +1,6 @@
 mock
 pytest
+pytest-cov==2.4.0
 tox
 twine==1.8.1
 behave

pytest.ini

@@ -1,2 +1,11 @@
 [bdist_wheel]
 universal = 1
+
+[tool:pytest]
+addopts = --capture=sys
+          --showlocals
+          --doctest-modules
+          --ignore=setup.py
+          --ignore=mycli/magic.py
+          --ignore=mycli/packages/parseutils.py
+          --ignore=test/features

requirements-dev.txt

@@ -16,7 +16,12 @@ def before_all(context):
     os.environ['LINES'] = "100"
     os.environ['COLUMNS'] = "100"
     os.environ['EDITOR'] = 'ex'
-    os.environ["COVERAGE_PROCESS_START"] = os.getcwd() + "/../.coveragerc"
+
+    context.package_root = os.path.abspath(
+        os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
+
+    os.environ["COVERAGE_PROCESS_START"] = os.path.join(context.package_root,
+                                                        '.coveragerc')
 
     context.exit_sent = False
 
@@ -48,7 +53,9 @@ def before_all(context):
         'pager_boundary': '---boundary---',
     }
     os.environ['PAGER'] = "{0} {1} {2}".format(
-        sys.executable, "test/features/wrappager.py", context.conf['pager_boundary'])
+        sys.executable,
+        os.path.join(context.package_root, 'test/features/wrappager.py'),
+        context.conf['pager_boundary'])
 
     context.cn = dbutils.create_db(context.conf['host'], context.conf['user'],
                                    context.conf['pass'],

setup.cfg

@@ -10,8 +10,8 @@
 @when('we start external editor providing a file name')
 def step_edit_file(context):
     """Edit file with external editor."""
-    context.editor_file_name = '../test_file_{0}.sql'.format(
-        context.conf['vi'])
+    context.editor_file_name = os.path.join(
+        context.package_root, 'test_file_{0}.sql'.format(context.conf['vi']))
     if os.path.exists(context.editor_file_name):
         os.remove(context.editor_file_name)
     context.cli.sendline('\e {0}'.format(
@@ -48,7 +48,8 @@ def step_edit_done_sql(context):
 
 @when(u'we tee output')
 def step_tee_ouptut(context):
-    context.tee_file_name = '../tee_file_{0}.sql'.format(context.conf['vi'])
+    context.tee_file_name = os.path.join(
+        context.package_root, 'tee_file_{0}.sql'.format(context.conf['vi']))
     if os.path.exists(context.tee_file_name):
         os.remove(context.tee_file_name)
     context.cli.sendline('tee {0}'.format(

test/features/environment.py

@@ -38,7 +38,7 @@ def run_cli(context):
 
     cmd_parts = [cli_cmd] + run_args
     cmd = ' '.join(cmd_parts)
-    context.cli = pexpect.spawnu(cmd, cwd='..')
+    context.cli = pexpect.spawnu(cmd, cwd=context.package_root)
     context.exit_sent = False
     context.currentdb = context.conf['dbname']