Distinction between unit and functional done

guilhermechapiewski · Aug 6, 2010 · cf10adf · cf10adf
1 parent 7742d57
commit cf10adf
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,8 @@ help:
 	@echo "Please use 'make <target>' where <target> is one of"
 	@echo "  clean      to clean garbage left by builds and installation"
 	@echo "  compile    to compile .py files (just to check for syntax errors)"
-	@echo "  test       to execute all simple-db-migrate tests"
+	@echo "  unit       to execute all db-migrate unit tests"
+	@echo "  func       to execute all db-migrate functional tests"
 	@echo "  install    to install simple-db-migrate"
 	@echo "  build      to build without installing simple-db-migrate"
 	@echo "  dist       to create egg for distribution"
@@ -29,10 +30,16 @@ metrics:
 	@pylint db_migrate.ui db_migrate.domain
 	@pyflakes db_migrate/ui db_migrate/domain
 
-test: compile
+unit: compile
 	@make clean
 	@echo "Starting tests..."
-	@nosetests -s --verbose --with-coverage --cover-erase --cover-package=db_migrate tests/*
+	@nosetests -s --verbose --with-coverage --cover-erase --cover-package=db_migrate tests/unit/*
+	@make clean
+
+func: compile
+	@make clean
+	@echo "Starting tests..."
+	@nosetests -s --verbose --with-coverage --cover-erase --cover-package=db_migrate tests/functional/*
 	@make clean
 
 install:

diff --git a/tests/console/__init__.py → tests/functional/__init__.py b/tests/console/__init__.py → tests/functional/__init__.py
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
diff --git a/tests/cli_test.py → tests/unit/cli_test.py b/tests/cli_test.py → tests/unit/cli_test.py
diff --git a/tests/config_test.py → tests/unit/config_test.py b/tests/config_test.py → tests/unit/config_test.py
diff --git a/tests/domain/__init__.py → tests/unit/console/__init__.py b/tests/domain/__init__.py → tests/unit/console/__init__.py
diff --git a/tests/console/test_console.py → tests/unit/console/test_console.py b/tests/console/test_console.py → tests/unit/console/test_console.py
diff --git a/tests/console/test_helper.py → tests/unit/console/test_helper.py b/tests/console/test_helper.py → tests/unit/console/test_helper.py
diff --git a/tests/core/core_test.py → tests/unit/core/core_test.py b/tests/core/core_test.py → tests/unit/core/core_test.py
diff --git a/tests/dbtier_tests.py → tests/unit/dbtier_tests.py b/tests/dbtier_tests.py → tests/unit/dbtier_tests.py
diff --git a/tests/unit/domain/__init__.py b/tests/unit/domain/__init__.py
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+# encoding: utf-8
diff --git a/tests/domain/test_migrations.py → tests/unit/domain/test_migrations.py b/tests/domain/test_migrations.py → tests/unit/domain/test_migrations.py
diff --git a/tests/helpers_test.py → tests/unit/helpers_test.py b/tests/helpers_test.py → tests/unit/helpers_test.py
diff --git a/tests/main_test.py → tests/unit/main_test.py b/tests/main_test.py → tests/unit/main_test.py
diff --git a/tests/mysql_test.py → tests/unit/mysql_test.py b/tests/mysql_test.py → tests/unit/mysql_test.py
diff --git a/tests/stubs.py → tests/unit/stubs.py b/tests/stubs.py → tests/unit/stubs.py
diff --git a/tests/test_entry_point.py → tests/unit/test_entry_point.py b/tests/test_entry_point.py → tests/unit/test_entry_point.py