From fd8d3136832601a1835ff4e2eb1d2969ef9af165 Mon Sep 17 00:00:00 2001
From: Bob Farrell <robertanthonyfarrell@gmail.com>
Date: Thu, 10 Jun 2010 18:08:06 +0100
Subject: [PATCH] move tests/ directory into migrate/tests (much better form)
 and fix all import lines and other minor issues

---
 {tests => migrate/tests}/__init__.py                      | 0
 {tests => migrate/tests}/changeset/__init__.py            | 0
 {tests => migrate/tests}/changeset/test_changeset.py      | 2 +-
 {tests => migrate/tests}/changeset/test_constraint.py     | 2 +-
 {tests => migrate/tests}/fixture/__init__.py              | 2 +-
 {tests => migrate/tests}/fixture/base.py                  | 3 ---
 {tests => migrate/tests}/fixture/database.py              | 4 ++--
 {tests => migrate/tests}/fixture/models.py                | 0
 {tests => migrate/tests}/fixture/pathed.py                | 2 +-
 {tests => migrate/tests}/fixture/shell.py                 | 5 +++--
 {tests => migrate/tests}/integrated/__init__.py           | 0
 {tests => migrate/tests}/integrated/test_docs.py          | 4 ++--
 {tests => migrate/tests}/versioning/__init__.py           | 0
 {tests => migrate/tests}/versioning/test_api.py           | 6 +++---
 {tests => migrate/tests}/versioning/test_cfgparse.py      | 2 +-
 {tests => migrate/tests}/versioning/test_database.py      | 2 +-
 {tests => migrate/tests}/versioning/test_genmodel.py      | 2 +-
 {tests => migrate/tests}/versioning/test_keyedinstance.py | 2 +-
 {tests => migrate/tests}/versioning/test_pathed.py        | 2 +-
 {tests => migrate/tests}/versioning/test_repository.py    | 2 +-
 {tests => migrate/tests}/versioning/test_runchangeset.py  | 2 +-
 {tests => migrate/tests}/versioning/test_schema.py        | 2 +-
 {tests => migrate/tests}/versioning/test_schemadiff.py    | 2 +-
 {tests => migrate/tests}/versioning/test_script.py        | 6 +++---
 {tests => migrate/tests}/versioning/test_shell.py         | 8 ++++----
 {tests => migrate/tests}/versioning/test_template.py      | 2 +-
 {tests => migrate/tests}/versioning/test_util.py          | 2 +-
 {tests => migrate/tests}/versioning/test_version.py       | 2 +-
 28 files changed, 33 insertions(+), 35 deletions(-)
 rename {tests => migrate/tests}/__init__.py (100%)
 rename {tests => migrate/tests}/changeset/__init__.py (100%)
 rename {tests => migrate/tests}/changeset/test_changeset.py (99%)
 rename {tests => migrate/tests}/changeset/test_constraint.py (99%)
 rename {tests => migrate/tests}/fixture/__init__.py (97%)
 rename {tests => migrate/tests}/fixture/base.py (95%)
 rename {tests => migrate/tests}/fixture/database.py (98%)
 rename {tests => migrate/tests}/fixture/models.py (100%)
 rename {tests => migrate/tests}/fixture/pathed.py (98%)
 rename {tests => migrate/tests}/fixture/shell.py (86%)
 rename {tests => migrate/tests}/integrated/__init__.py (100%)
 rename {tests => migrate/tests}/integrated/test_docs.py (85%)
 rename {tests => migrate/tests}/versioning/__init__.py (100%)
 rename {tests => migrate/tests}/versioning/test_api.py (97%)
 rename {tests => migrate/tests}/versioning/test_cfgparse.py (96%)
 rename {tests => migrate/tests}/versioning/test_database.py (90%)
 rename {tests => migrate/tests}/versioning/test_genmodel.py (87%)
 rename {tests => migrate/tests}/versioning/test_keyedinstance.py (97%)
 rename {tests => migrate/tests}/versioning/test_pathed.py (97%)
 rename {tests => migrate/tests}/versioning/test_repository.py (99%)
 rename {tests => migrate/tests}/versioning/test_runchangeset.py (98%)
 rename {tests => migrate/tests}/versioning/test_schema.py (99%)
 rename {tests => migrate/tests}/versioning/test_schemadiff.py (99%)
 rename {tests => migrate/tests}/versioning/test_script.py (97%)
 rename {tests => migrate/tests}/versioning/test_shell.py (99%)
 rename {tests => migrate/tests}/versioning/test_template.py (98%)
 rename {tests => migrate/tests}/versioning/test_util.py (98%)
 rename {tests => migrate/tests}/versioning/test_version.py (99%)

diff --git a/tests/__init__.py b/migrate/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to migrate/tests/__init__.py
diff --git a/tests/changeset/__init__.py b/migrate/tests/changeset/__init__.py
similarity index 100%
rename from tests/changeset/__init__.py
rename to migrate/tests/changeset/__init__.py
diff --git a/tests/changeset/test_changeset.py b/migrate/tests/changeset/test_changeset.py
similarity index 99%
rename from tests/changeset/test_changeset.py
rename to migrate/tests/changeset/test_changeset.py
index 97db212..beeb509 100644
--- a/tests/changeset/test_changeset.py
+++ b/migrate/tests/changeset/test_changeset.py
@@ -6,7 +6,7 @@ from sqlalchemy import *
 from migrate import changeset
 from migrate.changeset import *
 from migrate.changeset.schema import ColumnDelta
-from tests import fixture
+from migrate.tests import fixture
 
 
 class TestAddDropColumn(fixture.DB):
diff --git a/tests/changeset/test_constraint.py b/migrate/tests/changeset/test_constraint.py
similarity index 99%
rename from tests/changeset/test_constraint.py
rename to migrate/tests/changeset/test_constraint.py
index 19e32ec..e5717f2 100644
--- a/tests/changeset/test_constraint.py
+++ b/migrate/tests/changeset/test_constraint.py
@@ -8,7 +8,7 @@ from sqlalchemy.exc import *
 from migrate.changeset import *
 from migrate.changeset.exceptions import *
 
-from tests import fixture
+from migrate.tests import fixture
 
 
 class CommonTestConstraint(fixture.DB):
diff --git a/tests/fixture/__init__.py b/migrate/tests/fixture/__init__.py
similarity index 97%
rename from tests/fixture/__init__.py
rename to migrate/tests/fixture/__init__.py
index 4f06680..2a40355 100644
--- a/tests/fixture/__init__.py
+++ b/migrate/tests/fixture/__init__.py
@@ -61,6 +61,6 @@ def main(imports=None):
         testRunner=Runner(verbosity=1))
 
 from base import Base
-from pathed import Pathed
+from migrate.tests.fixture.pathed import Pathed
 from shell import Shell
 from database import DB,usedb
diff --git a/tests/fixture/base.py b/migrate/tests/fixture/base.py
similarity index 95%
rename from tests/fixture/base.py
rename to migrate/tests/fixture/base.py
index c64df7b..10e8f13 100644
--- a/tests/fixture/base.py
+++ b/migrate/tests/fixture/base.py
@@ -4,9 +4,6 @@
 import re
 import unittest
 
-from nose.tools import raises, eq_
-
-
 class Base(unittest.TestCase):
 
     def setup_method(self,func=None):
diff --git a/tests/fixture/database.py b/migrate/tests/fixture/database.py
similarity index 98%
rename from tests/fixture/database.py
rename to migrate/tests/fixture/database.py
index 89ae109..7155b26 100644
--- a/tests/fixture/database.py
+++ b/migrate/tests/fixture/database.py
@@ -12,8 +12,8 @@ from migrate.changeset import SQLA_06
 from migrate.changeset.schema import ColumnDelta
 from migrate.versioning.util import Memoize
 
-from tests.fixture.base import Base
-from tests.fixture.pathed import Pathed
+from migrate.tests.fixture.base import Base
+from migrate.tests.fixture.pathed import Pathed
 
 
 @Memoize
diff --git a/tests/fixture/models.py b/migrate/tests/fixture/models.py
similarity index 100%
rename from tests/fixture/models.py
rename to migrate/tests/fixture/models.py
diff --git a/tests/fixture/pathed.py b/migrate/tests/fixture/pathed.py
similarity index 98%
rename from tests/fixture/pathed.py
rename to migrate/tests/fixture/pathed.py
index 3f670de..b36aa08 100644
--- a/tests/fixture/pathed.py
+++ b/migrate/tests/fixture/pathed.py
@@ -6,7 +6,7 @@ import sys
 import shutil
 import tempfile
 
-from tests.fixture import base
+from migrate.tests.fixture import base
 
 
 class Pathed(base.Base):
diff --git a/tests/fixture/shell.py b/migrate/tests/fixture/shell.py
similarity index 86%
rename from tests/fixture/shell.py
rename to migrate/tests/fixture/shell.py
index 62cdb0b..92f9e33 100644
--- a/tests/fixture/shell.py
+++ b/migrate/tests/fixture/shell.py
@@ -6,7 +6,7 @@ import sys
 
 from scripttest import TestFileEnvironment
 
-from tests.fixture.pathed import *
+from migrate.tests.fixture.pathed import *
 
 
 class Shell(Pathed):
@@ -17,7 +17,8 @@ class Shell(Pathed):
         self.env = TestFileEnvironment(
             base_path=os.path.join(self.temp_usable_dir, 'env'),
             script_path=[os.path.dirname(sys.executable)], # PATH to migrate development script folder
-            environ={'PYTHONPATH': '%s/tests' % (os.getcwd(),)},
+            environ={'PYTHONPATH':
+                os.path.join(os.getcwd(), 'migrate', 'tests')},
         )
         self.env.run("virtualenv %s" % self.env.base_path)
         self.env.run("%s/bin/python setup.py install" % (self.env.base_path,), cwd=os.getcwd())
diff --git a/tests/integrated/__init__.py b/migrate/tests/integrated/__init__.py
similarity index 100%
rename from tests/integrated/__init__.py
rename to migrate/tests/integrated/__init__.py
diff --git a/tests/integrated/test_docs.py b/migrate/tests/integrated/test_docs.py
similarity index 85%
rename from tests/integrated/test_docs.py
rename to migrate/tests/integrated/test_docs.py
index 71c97a7..6aed071 100644
--- a/tests/integrated/test_docs.py
+++ b/migrate/tests/integrated/test_docs.py
@@ -2,11 +2,11 @@ import doctest
 import os
 
 
-from tests import fixture
+from migrate.tests import fixture
 
 # Collect tests for all handwritten docs: doc/*.rst
 
-dir = ('..','..','docs')
+dir = ('..','..','..','docs')
 absdir = (os.path.dirname(os.path.abspath(__file__)),)+dir
 dirpath = os.path.join(*absdir)
 files = [f for f in os.listdir(dirpath) if f.endswith('.rst')]
diff --git a/tests/versioning/__init__.py b/migrate/tests/versioning/__init__.py
similarity index 100%
rename from tests/versioning/__init__.py
rename to migrate/tests/versioning/__init__.py
diff --git a/tests/versioning/test_api.py b/migrate/tests/versioning/test_api.py
similarity index 97%
rename from tests/versioning/test_api.py
rename to migrate/tests/versioning/test_api.py
index f4ea73c..41152b0 100644
--- a/tests/versioning/test_api.py
+++ b/migrate/tests/versioning/test_api.py
@@ -4,9 +4,9 @@
 from migrate.versioning import api
 from migrate.versioning.exceptions import *
 
-from tests.fixture.pathed import *
-from tests.fixture import models
-from tests import fixture
+from migrate.tests.fixture.pathed import *
+from migrate.tests.fixture import models
+from migrate.tests import fixture
 
 
 class TestAPI(Pathed):
diff --git a/tests/versioning/test_cfgparse.py b/migrate/tests/versioning/test_cfgparse.py
similarity index 96%
rename from tests/versioning/test_cfgparse.py
rename to migrate/tests/versioning/test_cfgparse.py
index f424162..27f52cd 100644
--- a/tests/versioning/test_cfgparse.py
+++ b/migrate/tests/versioning/test_cfgparse.py
@@ -4,7 +4,7 @@
 from migrate.versioning import cfgparse
 from migrate.versioning.repository import *
 from migrate.versioning.template import Template
-from tests import fixture
+from migrate.tests import fixture
 
 
 class TestConfigParser(fixture.Base):
diff --git a/tests/versioning/test_database.py b/migrate/tests/versioning/test_database.py
similarity index 90%
rename from tests/versioning/test_database.py
rename to migrate/tests/versioning/test_database.py
index 090c086..525385f 100644
--- a/tests/versioning/test_database.py
+++ b/migrate/tests/versioning/test_database.py
@@ -1,5 +1,5 @@
 from sqlalchemy import select
-from tests import fixture
+from migrate.tests import fixture
 
 class TestConnect(fixture.DB):
     level=fixture.DB.TXN
diff --git a/tests/versioning/test_genmodel.py b/migrate/tests/versioning/test_genmodel.py
similarity index 87%
rename from tests/versioning/test_genmodel.py
rename to migrate/tests/versioning/test_genmodel.py
index 0fb7aed..61610a1 100644
--- a/tests/versioning/test_genmodel.py
+++ b/migrate/tests/versioning/test_genmodel.py
@@ -6,7 +6,7 @@ import os
 from migrate.versioning.genmodel import *
 from migrate.versioning.exceptions import *
 
-from tests import fixture
+from migrate.tests import fixture
 
 
 class TestModelGenerator(fixture.Pathed, fixture.DB):
diff --git a/tests/versioning/test_keyedinstance.py b/migrate/tests/versioning/test_keyedinstance.py
similarity index 97%
rename from tests/versioning/test_keyedinstance.py
rename to migrate/tests/versioning/test_keyedinstance.py
index 6e4f5dc..b2f87ac 100644
--- a/tests/versioning/test_keyedinstance.py
+++ b/migrate/tests/versioning/test_keyedinstance.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-from tests import fixture
+from migrate.tests import fixture
 from migrate.versioning.util.keyedinstance import *
 
 class TestKeydInstance(fixture.Base):
diff --git a/tests/versioning/test_pathed.py b/migrate/tests/versioning/test_pathed.py
similarity index 97%
rename from tests/versioning/test_pathed.py
rename to migrate/tests/versioning/test_pathed.py
index a2dfc24..7616e9d 100644
--- a/tests/versioning/test_pathed.py
+++ b/migrate/tests/versioning/test_pathed.py
@@ -1,4 +1,4 @@
-from tests import fixture
+from migrate.tests import fixture
 from migrate.versioning.pathed import *
 
 class TestPathed(fixture.Base):
diff --git a/tests/versioning/test_repository.py b/migrate/tests/versioning/test_repository.py
similarity index 99%
rename from tests/versioning/test_repository.py
rename to migrate/tests/versioning/test_repository.py
index a650d91..a23cd45 100644
--- a/tests/versioning/test_repository.py
+++ b/migrate/tests/versioning/test_repository.py
@@ -9,7 +9,7 @@ from migrate.versioning.repository import *
 from migrate.versioning.script import *
 from nose.tools import raises
 
-from tests import fixture
+from migrate.tests import fixture
 
 
 class TestRepository(fixture.Pathed):
diff --git a/tests/versioning/test_runchangeset.py b/migrate/tests/versioning/test_runchangeset.py
similarity index 98%
rename from tests/versioning/test_runchangeset.py
rename to migrate/tests/versioning/test_runchangeset.py
index 1b79b15..52b0215 100644
--- a/tests/versioning/test_runchangeset.py
+++ b/migrate/tests/versioning/test_runchangeset.py
@@ -3,7 +3,7 @@
 
 import os,shutil
 
-from tests import fixture
+from migrate.tests import fixture
 from migrate.versioning.schema import *
 from migrate.versioning import script
 
diff --git a/tests/versioning/test_schema.py b/migrate/tests/versioning/test_schema.py
similarity index 99%
rename from tests/versioning/test_schema.py
rename to migrate/tests/versioning/test_schema.py
index 3d14809..d4b4861 100644
--- a/tests/versioning/test_schema.py
+++ b/migrate/tests/versioning/test_schema.py
@@ -9,7 +9,7 @@ from migrate.versioning import script, exceptions, schemadiff
 
 from sqlalchemy import *
 
-from tests import fixture
+from migrate.tests import fixture
 
 
 class TestControlledSchema(fixture.Pathed, fixture.DB):
diff --git a/tests/versioning/test_schemadiff.py b/migrate/tests/versioning/test_schemadiff.py
similarity index 99%
rename from tests/versioning/test_schemadiff.py
rename to migrate/tests/versioning/test_schemadiff.py
index 4f2ae1f..6df6463 100644
--- a/tests/versioning/test_schemadiff.py
+++ b/migrate/tests/versioning/test_schemadiff.py
@@ -9,7 +9,7 @@ from nose.tools import eq_
 from migrate.versioning import genmodel, schemadiff
 from migrate.changeset import schema
 
-from tests import fixture
+from migrate.tests import fixture
 
 
 class TestSchemaDiff(fixture.DB):
diff --git a/tests/versioning/test_script.py b/migrate/tests/versioning/test_script.py
similarity index 97%
rename from tests/versioning/test_script.py
rename to migrate/tests/versioning/test_script.py
index f806bc8..51eeef8 100644
--- a/tests/versioning/test_script.py
+++ b/migrate/tests/versioning/test_script.py
@@ -9,8 +9,8 @@ from migrate.versioning import exceptions, version, repository
 from migrate.versioning.script import *
 from migrate.versioning.util import *
 
-from tests import fixture
-from tests.fixture.models import tmp_sql_table
+from migrate.tests import fixture
+from migrate.tests.fixture.models import tmp_sql_table
 
 
 class TestBaseScript(fixture.Pathed):
@@ -226,7 +226,7 @@ class TestSqlScript(fixture.Pathed, fixture.DB):
         # populate python script
         contents = open(script_path, 'r').read()
         contents = contents.replace("pass", "tmp_sql_table.create(migrate_engine)")
-        contents = 'from tests.fixture.models import tmp_sql_table\n' + contents
+        contents = 'from migrate.tests.fixture.models import tmp_sql_table\n' + contents
         f = open(script_path, 'w')
         f.write(contents)
         f.close()
diff --git a/tests/versioning/test_shell.py b/migrate/tests/versioning/test_shell.py
similarity index 99%
rename from tests/versioning/test_shell.py
rename to migrate/tests/versioning/test_shell.py
index 7db674c..1ce6dae 100644
--- a/tests/versioning/test_shell.py
+++ b/migrate/tests/versioning/test_shell.py
@@ -15,8 +15,8 @@ from nose.plugins.skip import SkipTest
 from migrate.versioning.repository import Repository
 from migrate.versioning import genmodel, shell, api
 from migrate.versioning.exceptions import *
-from tests.fixture import Shell, DB, usedb
-from tests.fixture import models
+from migrate.tests.fixture import Shell, DB, usedb
+from migrate.tests.fixture import models
 
 
 class TestShellCommands(Shell):
@@ -450,8 +450,8 @@ class TestShellDatabase(Shell, DB):
         repos_name = 'repos_name'
         repos_path = self.tmp()
         script_path = self.tmp_py()
-        model_module = 'tests.fixture.models:meta_rundiffs'
-        old_model_module = 'tests.fixture.models:meta_old_rundiffs'
+        model_module = 'migrate.tests.fixture.models:meta_rundiffs'
+        old_model_module = 'migrate.tests.fixture.models:meta_old_rundiffs'
 
         # Create empty repository.
         self.meta = MetaData(self.engine, reflect=True)
diff --git a/tests/versioning/test_template.py b/migrate/tests/versioning/test_template.py
similarity index 98%
rename from tests/versioning/test_template.py
rename to migrate/tests/versioning/test_template.py
index 18303ab..c6a45a6 100644
--- a/tests/versioning/test_template.py
+++ b/migrate/tests/versioning/test_template.py
@@ -8,7 +8,7 @@ import migrate.versioning.templates
 from migrate.versioning.template import *
 from migrate.versioning import api
 
-from tests import fixture
+from migrate.tests import fixture
 
 
 class TestTemplate(fixture.Pathed):
diff --git a/tests/versioning/test_util.py b/migrate/tests/versioning/test_util.py
similarity index 98%
rename from tests/versioning/test_util.py
rename to migrate/tests/versioning/test_util.py
index 0ccb6de..76bd1fd 100644
--- a/tests/versioning/test_util.py
+++ b/migrate/tests/versioning/test_util.py
@@ -5,7 +5,7 @@ import os
 
 from sqlalchemy import *
 
-from tests import fixture
+from migrate.tests import fixture
 from migrate.versioning.util import *
 
 
diff --git a/tests/versioning/test_version.py b/migrate/tests/versioning/test_version.py
similarity index 99%
rename from tests/versioning/test_version.py
rename to migrate/tests/versioning/test_version.py
index 5840612..0be192f 100644
--- a/tests/versioning/test_version.py
+++ b/migrate/tests/versioning/test_version.py
@@ -4,7 +4,7 @@
 from migrate.versioning.version import *
 from migrate.versioning.exceptions import *
 
-from tests import fixture
+from migrate.tests import fixture
 
 
 class TestVerNum(fixture.Base):