Resolve some inconsistencies in testing

dmsimard · Oct 10, 2015 · bdc27ac · bdc27ac
1 parent 68f3e8f
commit bdc27ac
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,4 +1,6 @@
 sphinx
 sphinxcontrib-httpdomain
 unittest2py3k
-mock
+mock
+discover
+flake8
diff --git a/tox.ini b/tox.ini
@@ -4,11 +4,12 @@ envlist = py34,pep8
 skipdist = True
 
 [testenv]
+sitepackages = True
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
-commands=unit2-3.4 discover []
+commands=discover
 
 [testenv:pep8]
 commands = flake8 versiontracker
@@ -24,4 +25,4 @@ commands = flake8 versiontracker
 # H405: multi line docstring summary not separated with an empty line
 # ignore = H101,H301,H306,H401,H403,H404,H405
 show-source = True
-exclude = .venv,.tox,docs,*egg,*settings.py
+exclude = .venv,.tox,docs,*egg,*settings.py
diff --git a/versiontracker/tests/api/__init__.py b/versiontracker/tests/api/__init__.py
diff --git a/versiontracker/tests/api/test-packages.py → versiontracker/tests/api/test_packages.py b/versiontracker/tests/api/test-packages.py → versiontracker/tests/api/test_packages.py
diff --git a/versiontracker/tests/fakes.py b/versiontracker/tests/fakes.py
@@ -34,6 +34,7 @@
 
 TWO_REPO_CONFIGS = REPO_CONFIG_ONE + REPO_CONFIG_TWO
 
+
 class FakeSettings(object):
     def __init__(self):
         self.REPOSITORIES = collections.OrderedDict({