move test back to tests

Yelp · Oct 24, 2014 · a922b31 · a922b31
1 parent e32af9b
commit a922b31
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 9 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -2,8 +2,8 @@
 branch = True
 source =
     venv_update
-    test
-    ../../../test
+    tests
+    ../../../tests
 
 [report]
 exclude_lines =

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,8 +8,8 @@
     -   id: debug-statements
         files: \.py$
     -   id: name-tests-test
-        files: test/.+\.py$
-        exclude: test/testing
+        files: tests/.+\.py$
+        exclude: tests/testing
     -   id: flake8
         files: \.py$
 

diff --git a/.travis/test.sh b/.travis/test.sh
@@ -13,6 +13,6 @@ py.test --version
 coverage erase
 py.test "$@" -n $NCPU \
     --cov-enable --cov-config=$TOP/.coveragerc --cov-report='' \
-    $TOP/test $SITEPACKAGES/${PROJECT}.py
+    $TOP/tests $SITEPACKAGES/${PROJECT}.py
 coverage combine
 coverage report --fail-under 81  # FIXME: should be 100
diff --git a/Makefile b/Makefile
@@ -5,8 +5,8 @@ all: lint test
 lint:
 	pre-commit run --all
 
-.PHONY: test
-test:
+.PHONY: test tests
+test tests:
 	./.travis/test.sh $(ARGS)
 
 .PHONY: tox

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def main():
             'Programming Language :: Python :: 2.7',
         ],
         py_modules=['venv_update'],
-        packages=find_packages('.', exclude=('test*',)),
+        packages=find_packages('.', exclude=('tests*',)),
         install_requires=[
             'plumbum',
             'virtualenv',

diff --git a/test/functional/__init__.py → tests/functional/__init__.py b/test/functional/__init__.py → tests/functional/__init__.py
diff --git a/test/functional/simple_test.py → tests/functional/simple_test.py b/test/functional/simple_test.py → tests/functional/simple_test.py
@@ -4,7 +4,7 @@
 import pytest
 
 TOP = Path(__file__) / '../../..'
-SCENARIOS = TOP/'test/scenarios'
+SCENARIOS = TOP/'tests/scenarios'
 
 
 def run(cmd, *args, **env):

diff --git a/test/scenarios/trivial/packages/.keepme → tests/scenarios/trivial/packages/.keepme b/test/scenarios/trivial/packages/.keepme → tests/scenarios/trivial/packages/.keepme
diff --git a/test/scenarios/trivial/requirements.txt → tests/scenarios/trivial/requirements.txt b/test/scenarios/trivial/requirements.txt → tests/scenarios/trivial/requirements.txt
diff --git a/test/testing/__init__.py → tests/testing/__init__.py b/test/testing/__init__.py → tests/testing/__init__.py
diff --git a/test/testing/capture_subprocess.py → tests/testing/capture_subprocess.py b/test/testing/capture_subprocess.py → tests/testing/capture_subprocess.py
diff --git a/test/testing/capture_subprocess_test.py → tests/testing/capture_subprocess_test.py b/test/testing/capture_subprocess_test.py → tests/testing/capture_subprocess_test.py
diff --git a/test/unit/__init__.py → tests/unit/__init__.py b/test/unit/__init__.py → tests/unit/__init__.py
diff --git a/test/unit/simple_test.py → tests/unit/simple_test.py b/test/unit/simple_test.py → tests/unit/simple_test.py