Merge lp:~cjwatson/storm/move-tests into lp:storm

[Colin Watson]

Move tests to a new storm.tests package to avoid package manager conflicts.

[Kristian Glass (doismellburning)]

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2019-05-30 13:21:20 +0000
+++ MANIFEST.in	2019-08-11 17:54:31 +0000
@@ -1,4 +1,3 @@
-recursive-include storm *.py *.c *.zcml
-recursive-include tests *.py *.txt
+recursive-include storm *.py *.c *.zcml *.txt
 
 include MANIFEST.in LICENSE README TODO NEWS Makefile setup.cfg test tox.ini
 
=== modified file 'NEWS'
--- NEWS	2019-06-25 21:33:26 +0000
+++ NEWS	2019-08-11 17:54:31 +0000
@@ -19,6 +19,8 @@
 - Fixed SQLObject tests to work with SQLObject 2.x by using Unicode strings for
   LIKE operations.
 - Cope with ThreadTransactionManager changes in transaction 2.4.0.
+- Move tests to a new storm.tests package to avoid package manager conflicts
+  (bug #1199578).
 
 API changes
 -----------
 
=== modified file 'setup.py'
--- setup.py	2019-06-06 10:14:55 +0000
+++ setup.py	2019-08-11 17:54:31 +0000
@@ -69,7 +69,7 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=["six"],
-    test_suite="tests.find_tests",
+    test_suite="storm.tests.find_tests",
     tests_require=tests_require,
     extras_require={"test": tests_require},
     )
 
=== renamed directory 'tests' => 'storm/tests'
=== modified file 'storm/tests/__init__.py'
--- tests/__init__.py	2019-06-05 11:41:07 +0000
+++ storm/tests/__init__.py	2019-08-11 17:54:31 +0000
@@ -69,7 +69,7 @@
     """
     suite = unittest.TestSuite()
     topdir = os.path.abspath(
-        os.path.join(os.path.dirname(__file__), os.pardir))
+        os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
     testdir = os.path.dirname(__file__)
     testpaths = set(testpaths)
     for root, dirnames, filenames in os.walk(testdir):
@@ -78,7 +78,7 @@
             relpath = filepath[len(topdir)+1:]
 
             if (filename == "__init__.py" or filename.endswith(".pyc") or
-                relpath == os.path.join("tests", "conftest.py")):
+                relpath == os.path.join("storm", "tests", "conftest.py")):
                 # Skip non-tests.
                 continue
 
@@ -97,10 +97,11 @@
                     unittest.defaultTestLoader.loadTestsFromModule(module))
             elif filename.endswith(".txt"):
                 load_test = True
-                if relpath == os.path.join("tests", "zope", "README.txt"):
+                if relpath == os.path.join(
+                        "storm", "tests", "zope", "README.txt"):
                     # Special case the inclusion of the Zope-dependent
                     # ZStorm doctest.
-                    import tests.zope as ztest
+                    import storm.tests.zope as ztest
                     load_test = (
                         ztest.has_transaction and
                         ztest.has_zope_component and
 
=== modified file 'storm/tests/base.py'
--- tests/base.py	2019-06-05 11:41:07 +0000
+++ storm/tests/base.py	2019-08-11 17:54:31 +0000
@@ -26,8 +26,7 @@
 from storm.properties import Property, PropertyPublisherMeta
 from storm.info import get_obj_info
 from storm.base import *
-
-from tests.helper import TestHelper
+from storm.tests.helper import TestHelper
 
 
 class BaseTest(TestHelper):
 
=== modified file 'storm/tests/cache.py'
--- tests/cache.py	2019-06-05 11:41:07 +0000
+++ storm/tests/cache.py	2019-08-11 17:54:31 +0000
@@ -5,8 +5,7 @@
 from storm.properties import Int
 from storm.info import get_obj_info
 from storm.cache import Cache, GenerationalCache
-
-from tests.helper import TestHelper
+from storm.tests.helper import TestHelper
 
 
 class StubObjectInfo(object):
 
=== modified file 'storm/tests/database.py'
--- tests/database.py	2019-06-25 21:33:26 +0000
+++ storm/tests/database.py	2019-08-11 17:54:31 +0000
@@ -31,9 +31,8 @@
 from storm.tracer import install_tracer, remove_all_tracers, DebugTracer
 from storm.uri import URI
 from storm.expr import *
-
-from tests.helper import TestHelper
-from tests.mocker import ARGS
+from storm.tests.helper import TestHelper
+from storm.tests.mocker import ARGS
 
 
 marker = object()
 
=== modified file 'storm/tests/databases/base.py'
--- tests/databases/base.py	2019-06-07 17:14:33 +0000
+++ storm/tests/databases/base.py	2019-08-11 17:54:31 +0000
@@ -40,9 +40,8 @@
 from storm.exceptions import (
     DatabaseError, DatabaseModuleError, ConnectionBlockedError,
     DisconnectionError, Error, OperationalError, ProgrammingError)
-
-from tests.databases.proxy import ProxyTCPServer
-from tests.helper import MakePath
+from storm.tests.databases.proxy import ProxyTCPServer
+from storm.tests.helper import MakePath
 
 
 class Marker(object):
 
=== modified file 'storm/tests/databases/postgres.py'
--- tests/databases/postgres.py	2019-06-05 11:41:07 +0000
+++ storm/tests/databases/postgres.py	2019-08-11 17:54:31 +0000
@@ -44,13 +44,13 @@
 import storm.info
 storm  # Silence lint.
 
-from tests import has_fixtures, has_subunit
-from tests.databases.base import (
+from storm.tests import has_fixtures, has_subunit
+from storm.tests.databases.base import (
     DatabaseTest, DatabaseDisconnectionTest, UnsupportedDatabaseTest,
     TwoPhaseCommitTest, TwoPhaseCommitDisconnectionTest)
-from tests.expr import column1, column2, column3, elem1, table1, TrackContext
-from tests.tracer import TimeoutTracerTestBase
-from tests.helper import TestHelper
+from storm.tests.expr import column1, column2, column3, elem1, table1, TrackContext
+from storm.tests.tracer import TimeoutTracerTestBase
+from storm.tests.helper import TestHelper
 
 try:
     import pgbouncer
 
=== modified file 'storm/tests/databases/sqlite.py'
--- tests/databases/sqlite.py	2019-06-05 11:41:07 +0000
+++ storm/tests/databases/sqlite.py	2019-08-11 17:54:31 +0000
@@ -28,9 +28,8 @@
 from storm.databases.sqlite import SQLite
 from storm.database import create_database
 from storm.uri import URI
-
-from tests.databases.base import DatabaseTest, UnsupportedDatabaseTest
-from tests.helper import TestHelper, MakePath
+from storm.tests.databases.base import DatabaseTest, UnsupportedDatabaseTest
+from storm.tests.helper import TestHelper, MakePath
 
 
 class SQLiteMemoryTest(DatabaseTest, TestHelper):
 
=== modified file 'storm/tests/event.py'
--- tests/event.py	2019-06-05 11:41:07 +0000
+++ storm/tests/event.py	2019-08-11 17:54:31 +0000
@@ -21,8 +21,7 @@
 from __future__ import print_function
 
 from storm.event import EventSystem
-
-from tests.helper import TestHelper
+from storm.tests.helper import TestHelper
 
 
 class Marker(object):
 
=== modified file 'storm/tests/expr.py'
--- tests/expr.py	2019-06-07 16:36:44 +0000
+++ storm/tests/expr.py	2019-08-11 17:54:31 +0000
@@ -25,10 +25,9 @@
 
 import six
 
-from tests.helper import TestHelper
-
 from storm.variables import *
 from storm.expr import *
+from storm.tests.helper import TestHelper
 
 
 class Func1(NamedFunc):
 
=== modified file 'storm/tests/helper.py'
--- tests/helper.py	2019-06-05 11:41:07 +0000
+++ storm/tests/helper.py	2019-08-11 17:54:31 +0000
@@ -26,7 +26,7 @@
 import shutil
 import sys
 
-from tests import mocker
+from storm.tests import mocker
 
 
 __all__ = ["TestHelper", "MakePath", "LogKeeper"]
 
=== modified file 'storm/tests/info.py'
--- tests/info.py	2019-06-05 11:41:07 +0000
+++ storm/tests/info.py	2019-08-11 17:54:31 +0000
@@ -28,8 +28,7 @@
 from storm.variables import Variable
 from storm.expr import Undef, Select, compile
 from storm.info import *
-
-from tests.helper import TestHelper
+from storm.tests.helper import TestHelper
 
 
 class Wrapper(object):
 
=== modified file 'storm/tests/infoheritance.txt'
--- tests/infoheritance.txt	2009-02-04 02:00:02 +0000
+++ storm/tests/infoheritance.txt	2019-08-11 17:54:31 +0000
@@ -1,5 +1,6 @@
 This Storm document is included in Storm's source code at
-`tests/infoheritance.txt` so that it can be tested and be kept up-to-date.
+`storm/tests/infoheritance.txt` so that it can be tested and be kept
+up-to-date.
 
 <<TableOfContents>>
 
 
=== modified file 'storm/tests/properties.py'
--- tests/properties.py	2019-06-05 11:41:07 +0000
+++ storm/tests/properties.py	2019-08-11 17:54:31 +0000
@@ -32,9 +32,8 @@
 from storm.variables import *
 from storm.info import get_obj_info
 from storm.expr import Column, Select, compile, State, SQLRaw
-
-from tests.info import Wrapper
-from tests.helper import TestHelper
+from storm.tests.info import Wrapper
+from storm.tests.helper import TestHelper
 
 
 class CustomVariable(Variable):
@@ -954,12 +953,13 @@
         self.registry.add_class(self.Class)
         self.registry.add_class(self.SubClass)
         self.registry.add_class(self.AnotherClass)
-        prop1 = self.registry.get("Class.prop1", "tests.properties")
-        prop2 = self.registry.get("Class.prop2", "tests.properties.bar")
+        prop1 = self.registry.get("Class.prop1", "storm.tests.properties")
+        prop2 = self.registry.get("Class.prop2", "storm.tests.properties.bar")
         self.assertTrue(prop1 is self.Class.prop1)
         self.assertTrue(prop2 is self.Class.prop2)
-        prop1 = self.registry.get("Class.prop1", "tests.properties.foo")
-        prop2 = self.registry.get("Class.prop2", "tests.properties.foo.bar")
+        prop1 = self.registry.get("Class.prop1", "storm.tests.properties.foo")
+        prop2 = self.registry.get(
+            "Class.prop2", "storm.tests.properties.foo.bar")
         self.assertTrue(prop1 is self.AnotherClass.prop1)
         self.assertTrue(prop2 is self.AnotherClass.prop2)
 
 
=== modified file 'storm/tests/schema/patch.py'
--- tests/schema/patch.py	2019-06-05 11:41:07 +0000
+++ storm/tests/schema/patch.py	2019-08-11 17:54:31 +0000
@@ -27,7 +27,7 @@
 from storm.locals import StormError, Store, create_database
 from storm.schema.patch import (
     Patch, PatchApplier, UnknownPatchError, BadPatchError, PatchSet)
-from tests.mocker import MockerTestCase
+from storm.tests.mocker import MockerTestCase
 
 
 patch_test_0 = """
 
=== modified file 'storm/tests/schema/schema.py'
--- tests/schema/schema.py	2019-06-05 11:41:07 +0000
+++ storm/tests/schema/schema.py	2019-08-11 17:54:31 +0000
@@ -26,7 +26,7 @@
 from storm.locals import StormError, Store, create_database
 from storm.schema.schema import (
     Schema, SchemaMissingError, UnappliedPatchesError)
-from tests.mocker import MockerTestCase
+from storm.tests.mocker import MockerTestCase
 
 
 class Package(object):
 
=== modified file 'storm/tests/schema/sharding.py'
--- tests/schema/sharding.py	2019-06-05 11:41:07 +0000
+++ storm/tests/schema/sharding.py	2019-08-11 17:54:31 +0000
@@ -20,10 +20,9 @@
 #
 from __future__ import print_function
 
-from tests.mocker import MockerTestCase
-
 from storm.schema.schema import SchemaMissingError, UnappliedPatchesError
 from storm.schema.sharding import Sharding, PatchLevelMismatchError
+from storm.tests.mocker import MockerTestCase
 
 
 class FakeSchema(object):
 
=== modified file 'storm/tests/sqlobject.py'
--- tests/sqlobject.py	2019-06-05 11:41:07 +0000
+++ storm/tests/sqlobject.py	2019-08-11 17:54:31 +0000
@@ -28,8 +28,7 @@
 from storm.sqlobject import *
 from storm.store import Store
 from storm.tz import tzutc
-
-from tests.helper import TestHelper
+from storm.tests.helper import TestHelper
 
 
 class SQLObjectTest(TestHelper):
 
=== modified file 'storm/tests/store/base.py'
--- tests/store/base.py	2019-06-07 17:14:33 +0000
+++ storm/tests/store/base.py	2019-08-11 17:54:31 +0000
@@ -49,9 +49,8 @@
 from storm.cache import Cache
 from storm.store import AutoReload, EmptyResultSet, Store, ResultSet
 from storm.tracer import debug
-
-from tests.info import Wrapper
-from tests.helper import TestHelper
+from storm.tests.info import Wrapper
+from storm.tests.helper import TestHelper
 
 
 class Foo(object):
 
=== modified file 'storm/tests/store/postgres.py'
--- tests/store/postgres.py	2019-06-05 11:41:07 +0000
+++ storm/tests/store/postgres.py	2019-08-11 17:54:31 +0000
@@ -26,9 +26,8 @@
 from storm.database import create_database
 from storm.properties import Enum, Int, List
 from storm.info import get_obj_info
-
-from tests.store.base import StoreTest, EmptyResultSetTest, Foo
-from tests.helper import TestHelper
+from storm.tests.store.base import StoreTest, EmptyResultSetTest, Foo
+from storm.tests.helper import TestHelper
 
 
 class Lst1(object):
 
=== modified file 'storm/tests/store/sqlite.py'
--- tests/store/sqlite.py	2019-06-05 11:41:07 +0000
+++ storm/tests/store/sqlite.py	2019-08-11 17:54:31 +0000
@@ -22,9 +22,8 @@
 
 from storm.databases.sqlite import SQLite
 from storm.uri import URI
-
-from tests.store.base import StoreTest, EmptyResultSetTest
-from tests.helper import TestHelper, MakePath
+from storm.tests.store.base import StoreTest, EmptyResultSetTest
+from storm.tests.helper import TestHelper, MakePath
 
 
 class SQLiteStoreTest(TestHelper, StoreTest):
 
=== modified file 'storm/tests/tracer.py'
--- tests/tracer.py	2019-06-05 11:41:07 +0000
+++ storm/tests/tracer.py	2019-08-11 17:54:31 +0000
@@ -5,7 +5,7 @@
 import sys
 from unittest import TestCase
 
-from tests import has_fixtures
+from storm.tests import has_fixtures
 
 # Optional dependency. If missing, Fixture tests are skipped.
 if has_fixtures:
@@ -28,8 +28,7 @@
                           TimelineTracer, TimeoutError, _tracers)
 from storm.database import Connection, create_database
 from storm.expr import Variable
-
-from tests.helper import TestHelper
+from storm.tests.helper import TestHelper
 
 
 class TracerTest(TestHelper):
 
=== modified file 'storm/tests/tutorial.txt'
--- tests/tutorial.txt	2019-06-05 11:41:07 +0000
+++ storm/tests/tutorial.txt	2019-08-11 17:54:31 +0000
@@ -4,7 +4,7 @@
 ==== It runs! ====
 
 This Storm tutorial is included in the source code at
-tests/tutorial.txt, so that it may be tested and stay
+storm/tests/tutorial.txt, so that it may be tested and stay
 up to date.
 
 
 
=== modified file 'storm/tests/twisted/transact.py'
--- tests/twisted/transact.py	2019-06-05 11:41:07 +0000
+++ storm/tests/twisted/transact.py	2019-08-11 17:54:31 +0000
@@ -1,9 +1,9 @@
 from __future__ import print_function
 
-from tests import has_psycopg
-from tests.helper import TestHelper
-from tests.zope import has_transaction, has_zope_component
-from tests.twisted import has_twisted
+from storm.tests import has_psycopg
+from storm.tests.helper import TestHelper
+from storm.tests.zope import has_transaction, has_zope_component
+from storm.tests.twisted import has_twisted
 
 if has_transaction and has_zope_component and has_twisted:
     import transaction
 
=== modified file 'storm/tests/uri.py'
--- tests/uri.py	2019-06-05 11:41:07 +0000
+++ storm/tests/uri.py	2019-08-11 17:54:31 +0000
@@ -21,8 +21,7 @@
 from __future__ import print_function
 
 from storm.uri import URI, URIError
-
-from tests.helper import TestHelper
+from storm.tests.helper import TestHelper
 
 
 class URITest(TestHelper):
 
=== modified file 'storm/tests/variables.py'
--- tests/variables.py	2019-06-07 17:14:33 +0000
+++ storm/tests/variables.py	2019-08-11 17:54:31 +0000
@@ -36,8 +36,7 @@
 from storm.expr import Column, SQLToken
 from storm.tz import tzutc, tzoffset
 from storm import Undef
-
-from tests.helper import TestHelper
+from storm.tests.helper import TestHelper
 
 
 class Marker(object):
 
=== modified file 'storm/tests/zope/adapters.py'
--- tests/zope/adapters.py	2019-06-06 10:14:55 +0000
+++ storm/tests/zope/adapters.py	2019-08-11 17:54:31 +0000
@@ -20,8 +20,8 @@
 #
 from __future__ import print_function
 
-from tests.helper import TestHelper
-from tests.zope import has_zope_component
+from storm.tests.helper import TestHelper
+from storm.tests.zope import has_zope_component
 
 
 if has_zope_component:
 
=== modified file 'storm/tests/zope/testing.py'
--- tests/zope/testing.py	2019-06-05 11:41:07 +0000
+++ storm/tests/zope/testing.py	2019-08-11 17:54:31 +0000
@@ -23,8 +23,12 @@
 import os
 import sys
 
-from tests.helper import TestHelper
-from tests.zope import has_transaction, has_zope_component, has_testresources
+from storm.tests.helper import TestHelper
+from storm.tests.zope import (
+    has_testresources,
+    has_transaction,
+    has_zope_component,
+    )
 
 from storm.locals import create_database, Store, Unicode, Int
 from storm.exceptions import IntegrityError
 
=== modified file 'storm/tests/zope/zstorm.py'
--- tests/zope/zstorm.py	2019-06-06 12:04:07 +0000
+++ storm/tests/zope/zstorm.py	2019-08-11 17:54:31 +0000
@@ -24,8 +24,8 @@
 import weakref
 import gc
 
-from tests.helper import TestHelper
-from tests.zope import has_transaction, has_zope_component
+from storm.tests.helper import TestHelper
+from storm.tests.zope import has_transaction, has_zope_component
 
 if has_transaction:
     import transaction
 
=== modified file 'test'
--- test	2019-05-30 09:54:53 +0000
+++ test	2019-08-11 17:54:31 +0000
@@ -48,7 +48,7 @@
         runner.verbosity = 2
 
     # Import late, after any and all sys.path jiggery pokery.
-    from tests import find_tests
+    from storm.tests import find_tests
 
     suite = find_tests(args)
     result = runner.run(suite)