- fix the uuid routine here to not run out of uuids

3 files changed, 7 insertions, 24 deletions

diff --git a/test/engine/test_reconnect.py b/test/engine/test_reconnect.py
index a3ad9c548..6e21f572d 100644
--- a/test/engine/test_reconnect.py
+++ b/test/engine/test_reconnect.py
@@ -411,6 +411,8 @@ def _assert_invalidated(fn, *args):
             raise
 
 class RealReconnectTest(fixtures.TestBase):
+    __backend__ = True
+
     def setup(self):
         self.engine = engines.reconnecting_engine()
 
@@ -595,6 +597,7 @@ class RealReconnectTest(fixtures.TestBase):
         assert not conn.invalidated
 
 class RecycleTest(fixtures.TestBase):
+    __backend__ = True
 
     def test_basic(self):
         for threadlocal in False, True:
@@ -625,6 +628,8 @@ class RecycleTest(fixtures.TestBase):
             conn.close()
 
 class InvalidateDuringResultTest(fixtures.TestBase):
+    __backend__ = True
+
     def setup(self):
         self.engine = engines.reconnecting_engine()
         self.meta = MetaData(self.engine)
diff --git a/test/orm/test_session.py b/test/orm/test_session.py
index de5473470..1a78c51b8 100644
--- a/test/orm/test_session.py
+++ b/test/orm/test_session.py
@@ -1031,7 +1031,6 @@ class NoCyclesOnTransientDetachedTest(_fixtures.FixtureTest):
 
 class WeakIdentityMapTest(_fixtures.FixtureTest):
     run_inserts = None
-    __backend__ = True
 
     @testing.requires.predictable_gc
     def test_weakref(self):
@@ -1202,7 +1201,6 @@ class WeakIdentityMapTest(_fixtures.FixtureTest):
 
 class StrongIdentityMapTest(_fixtures.FixtureTest):
     run_inserts = None
-    __backend__ = True
 
     @testing.uses_deprecated()
     def test_strong_ref(self):
@@ -1283,7 +1281,6 @@ class StrongIdentityMapTest(_fixtures.FixtureTest):
 
 class IsModifiedTest(_fixtures.FixtureTest):
     run_inserts = None
-    __backend__ = True
 
     def _default_mapping_fixture(self):
         User, Address = self.classes.User, self.classes.Address
@@ -1397,7 +1394,6 @@ class DisposedStates(fixtures.MappedTest):
     run_setup_mappers = 'once'
     run_inserts = 'once'
     run_deletes = None
-    __backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
diff --git a/test/orm/test_versioning.py b/test/orm/test_versioning.py
index 3519d2c42..a7e6636ab 100644
--- a/test/orm/test_versioning.py
+++ b/test/orm/test_versioning.py
@@ -12,28 +12,10 @@ from sqlalchemy.testing import eq_, ne_, assert_raises, assert_raises_message
 from sqlalchemy.testing import fixtures
 from test.orm import _fixtures
 from sqlalchemy.testing.assertsql import AllOf, CompiledSQL
-
-
-_uuids = [
-    '1fc614acbb904742a2990f86af6ded95',
-    '23e253786f4d491b9f9d6189dc33de9b',
-    'fc44910db37e43fd93e9ec8165b885cf',
-    '0187a1832b4249e6b48911821d86de58',
-    '778af6ea2fb74a009d8d2f5abe5dc29a',
-    '51a6ce031aff47e4b5f2895c4161f120',
-    '7434097cd319401fb9f15fa443ccbbbb',
-    '9bc548a8128e4a85ac18060bc3f4b7d3',
-    '59548715e3c440b7bcb96417d06f7930',
-    'd7647c7004734de196885ca2bd73adf8',
-    '70cef121d3ff48d39906b6d1ac77f41a',
-    'ee37a8a6430c466aa322b8a215a0dd70',
-    '782a5f04b4364a53a6fce762f48921c1',
-    'bef510f2420f4476a7629013ead237f5',
-    ]
+import uuid
 
 def make_uuid():
-    """generate uuids even on Python 2.4 which has no 'uuid'"""
-    return _uuids.pop(0)
+    return uuid.uuid4().hex
 
 class VersioningTest(fixtures.MappedTest):
     __backend__ = True