From ac8a3feacd45926b11815383e6ab5a13d2147d42 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <treinish@linux.vnet.ibm.com>
Date: Wed, 2 Oct 2013 11:42:24 -0400
Subject: [PATCH] Reorganize tests into unit and functional tests

This commit breaks up the tests into 2 subdirectories, unit and functional.
Functional tests use the network in some way and may require either a
queries file or a functional config. Unit tests do not have these
requirements. In addition the default tox job is changed to only run the
unit tests. The functional tests are give a separate tox job.

Change-Id: I4bdc7f1098bfb7fa16dd869b2e54b3154848c3e1
---
 elastic_recheck/tests/functional/__init__.py               | 0
 elastic_recheck/tests/{ => functional}/test_classifier.py  | 0
 .../tests/{ => functional}/test_gerrit_comment.py          | 0
 elastic_recheck/tests/{ => functional}/test_queries.py     | 0
 elastic_recheck/tests/unit/__init__.py                     | 0
 elastic_recheck/tests/{ => unit}/test_required_files.py    | 0
 tox.ini                                                    | 7 +++++--
 7 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 elastic_recheck/tests/functional/__init__.py
 rename elastic_recheck/tests/{ => functional}/test_classifier.py (100%)
 rename elastic_recheck/tests/{ => functional}/test_gerrit_comment.py (100%)
 rename elastic_recheck/tests/{ => functional}/test_queries.py (100%)
 create mode 100644 elastic_recheck/tests/unit/__init__.py
 rename elastic_recheck/tests/{ => unit}/test_required_files.py (100%)

diff --git a/elastic_recheck/tests/functional/__init__.py b/elastic_recheck/tests/functional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/elastic_recheck/tests/test_classifier.py b/elastic_recheck/tests/functional/test_classifier.py
similarity index 100%
rename from elastic_recheck/tests/test_classifier.py
rename to elastic_recheck/tests/functional/test_classifier.py
diff --git a/elastic_recheck/tests/test_gerrit_comment.py b/elastic_recheck/tests/functional/test_gerrit_comment.py
similarity index 100%
rename from elastic_recheck/tests/test_gerrit_comment.py
rename to elastic_recheck/tests/functional/test_gerrit_comment.py
diff --git a/elastic_recheck/tests/test_queries.py b/elastic_recheck/tests/functional/test_queries.py
similarity index 100%
rename from elastic_recheck/tests/test_queries.py
rename to elastic_recheck/tests/functional/test_queries.py
diff --git a/elastic_recheck/tests/unit/__init__.py b/elastic_recheck/tests/unit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/elastic_recheck/tests/test_required_files.py b/elastic_recheck/tests/unit/test_required_files.py
similarity index 100%
rename from elastic_recheck/tests/test_required_files.py
rename to elastic_recheck/tests/unit/test_required_files.py
diff --git a/tox.ini b/tox.ini
index 287fc475..e73f083d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py26,py27,py33,pypy,pep8
+envlist = py26,py27,py33,pypy,pep8,functional
 skipsdist = True
 
 [testenv]
@@ -13,7 +13,10 @@ setenv =
    LC_ALL=C
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = python setup.py testr --slowest --testr-args='{posargs} tests.unit'
+
+[testenv:functional]
+commands = python setup.py testr --slowest --testr-args='{posargs} tests.functional'
 
 [testenv:pep8]
 commands = flake8