Move test location to top level

jeffknupp · Feb 6, 2014 · 4e3b3d4 · 4e3b3d4
1 parent 398fef2
commit 4e3b3d4
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ build:
 
 test: clean build
 		source sandman_env/bin/activate && \
-		coverage run --source=sandman setup.py test && \
+		coverage run --source=test setup.py test && \
 		coverage html && \
 		coverage report
 

diff --git a/sandman/test/__init__.py → tests/__init__.py b/sandman/test/__init__.py → tests/__init__.py
diff --git a/...an/test/data/ChinookDatabase1.4_MySql.zip → tests/data/ChinookDatabase1.4_MySql.zip b/...an/test/data/ChinookDatabase1.4_MySql.zip → tests/data/ChinookDatabase1.4_MySql.zip
diff --git a/sandman/test/data/Chinook_MySql.sql → tests/data/Chinook_MySql.sql b/sandman/test/data/Chinook_MySql.sql → tests/data/Chinook_MySql.sql
diff --git a/...t/data/Chinook_MySql_AutoIncrementPKs.sql → ...s/data/Chinook_MySql_AutoIncrementPKs.sql b/...t/data/Chinook_MySql_AutoIncrementPKs.sql → ...s/data/Chinook_MySql_AutoIncrementPKs.sql
diff --git a/sandman/test/data/Chinook_Sqlite.sql → tests/data/Chinook_Sqlite.sql b/sandman/test/data/Chinook_Sqlite.sql → tests/data/Chinook_Sqlite.sql
diff --git a/sandman/test/data/Chinook_Sqlite.sqlite → tests/data/Chinook_Sqlite.sqlite b/sandman/test/data/Chinook_Sqlite.sqlite → tests/data/Chinook_Sqlite.sqlite
diff --git a/.../data/Chinook_Sqlite_AutoIncrementPKs.sql → .../data/Chinook_Sqlite_AutoIncrementPKs.sql b/.../data/Chinook_Sqlite_AutoIncrementPKs.sql → .../data/Chinook_Sqlite_AutoIncrementPKs.sql
diff --git a/...ta/Chinook_Sqlite_AutoIncrementPKs.sqlite → ...ta/Chinook_Sqlite_AutoIncrementPKs.sqlite b/...ta/Chinook_Sqlite_AutoIncrementPKs.sqlite → ...ta/Chinook_Sqlite_AutoIncrementPKs.sqlite
diff --git a/sandman/test/data/CreateMySql.bat → tests/data/CreateMySql.bat b/sandman/test/data/CreateMySql.bat → tests/data/CreateMySql.bat
diff --git a/sandman/test/data/CreateSqlite.bat → tests/data/CreateSqlite.bat b/sandman/test/data/CreateSqlite.bat → tests/data/CreateSqlite.bat
diff --git a/sandman/test/data/chinook → tests/data/chinook b/sandman/test/data/chinook → tests/data/chinook
diff --git a/sandman/test/data/foreign_key → tests/data/foreign_key b/sandman/test/data/foreign_key → tests/data/foreign_key
diff --git a/sandman/test/foreign_key_models.py → tests/foreign_key_models.py b/sandman/test/foreign_key_models.py → tests/foreign_key_models.py
diff --git a/sandman/test/models.py → tests/models.py b/sandman/test/models.py → tests/models.py
diff --git a/sandman/test/templates/base.html → tests/templates/base.html b/sandman/test/templates/base.html → tests/templates/base.html
diff --git a/sandman/test/templates/resource.html → tests/templates/resource.html b/sandman/test/templates/resource.html → tests/templates/resource.html
diff --git a/sandman/test/test_foreign_keys.py → tests/test_foreign_keys.py b/sandman/test/test_foreign_keys.py → tests/test_foreign_keys.py
@@ -10,16 +10,15 @@ class TestSandmanForeignKeysBase(object):
     """Class to test edge-case foreign key conditions, using a database
     explicitly built to contain these cases."""
 
-    DB_LOCATION = os.path.join(os.getcwd(), 'sandman', 'test', 'foreign_key')
+    DB_LOCATION = os.path.join(os.getcwd(), 'tests', 'foreign_key')
 
     def setup_method(self, _):
         """Grab the database file from the *data* directory and configure the
         app."""
         shutil.copy(
                 os.path.join(
                     os.getcwd(),
-                    'sandman',
-                    'test',
+                    'tests',
                     'data',
                     'foreign_key'),
                 self.DB_LOCATION)

diff --git a/sandman/test/test_foreign_keys.py.bak → tests/test_foreign_keys.py.bak b/sandman/test/test_foreign_keys.py.bak → tests/test_foreign_keys.py.bak
diff --git a/sandman/test/test_sandman.py → tests/test_sandman.py b/sandman/test/test_sandman.py → tests/test_sandman.py
@@ -10,16 +10,15 @@
 class TestSandmanBase(object):
     """Base class for all sandman test classes."""
 
-    DB_LOCATION = os.path.join(os.getcwd(), 'sandman', 'test', 'chinook')
+    DB_LOCATION = os.path.join(os.getcwd(), 'tests', 'chinook')
 
     def setup_method(self, _):
         """Grab the database file from the *data* directory and configure the
         app."""
         shutil.copy(
                 os.path.join(
                     os.getcwd(),
-                    'sandman',
-                    'test',
+                    'tests',
                     'data',
                     'chinook'),
                 self.DB_LOCATION)