From 5137998a856519cd11cd743d6c567497600139e8 Mon Sep 17 00:00:00 2001 From: minimumserious Date: Thu, 13 Jun 2013 10:33:56 +0200 Subject: Fixed SQLAlchemy tests on Python32 --- tests/test_alchemy.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'tests/test_alchemy.py') diff --git a/tests/test_alchemy.py b/tests/test_alchemy.py index a1d8576..39e94c8 100644 --- a/tests/test_alchemy.py +++ b/tests/test_alchemy.py @@ -50,14 +50,14 @@ class StandardFactory(SQLAlchemyModelFactory): FACTORY_SESSION = models.session id = factory.Sequence(lambda n: n) - foo = factory.Sequence(lambda n: u'foo%d' % n) + foo = factory.Sequence(lambda n: 'foo%d' % n) class NonIntegerPkFactory(SQLAlchemyModelFactory): FACTORY_FOR = models.NonIntegerPk FACTORY_SESSION = models.session - id = factory.Sequence(lambda n: u'foo%d' % n) + id = factory.Sequence(lambda n: 'foo%d' % n) @unittest.skipIf(sqlalchemy is None, "SQLalchemy not installed.") @@ -70,32 +70,32 @@ class SQLAlchemyPkSequenceTestCase(unittest.TestCase): def test_pk_first(self): std = StandardFactory.build() - self.assertEqual(u'foo1', std.foo) + self.assertEqual('foo1', std.foo) def test_pk_many(self): std1 = StandardFactory.build() std2 = StandardFactory.build() - self.assertEqual(u'foo1', std1.foo) - self.assertEqual(u'foo2', std2.foo) + self.assertEqual('foo1', std1.foo) + self.assertEqual('foo2', std2.foo) def test_pk_creation(self): std1 = StandardFactory.create() - self.assertEqual(u'foo1', std1.foo) + self.assertEqual('foo1', std1.foo) self.assertEqual(1, std1.id) StandardFactory.reset_sequence() std2 = StandardFactory.create() - self.assertEqual(u'foo2', std2.foo) + self.assertEqual('foo2', std2.foo) self.assertEqual(2, std2.id) def test_pk_force_value(self): std1 = StandardFactory.create(id=10) - self.assertEqual(u'foo1', std1.foo) # sequence was set before pk + self.assertEqual('foo1', std1.foo) # sequence was set before pk self.assertEqual(10, std1.id) StandardFactory.reset_sequence() std2 = StandardFactory.create() - self.assertEqual(u'foo11', std2.foo) + self.assertEqual('foo11', std2.foo) self.assertEqual(11, std2.id) @@ -108,27 +108,27 @@ class SQLAlchemyNonIntegerPkTestCase(unittest.TestCase): def test_first(self): nonint = NonIntegerPkFactory.build() - self.assertEqual(u'foo1', nonint.id) + self.assertEqual('foo1', nonint.id) def test_many(self): nonint1 = NonIntegerPkFactory.build() nonint2 = NonIntegerPkFactory.build() - self.assertEqual(u'foo1', nonint1.id) - self.assertEqual(u'foo2', nonint2.id) + self.assertEqual('foo1', nonint1.id) + self.assertEqual('foo2', nonint2.id) def test_creation(self): nonint1 = NonIntegerPkFactory.create() - self.assertEqual(u'foo1', nonint1.id) + self.assertEqual('foo1', nonint1.id) NonIntegerPkFactory.reset_sequence() nonint2 = NonIntegerPkFactory.build() - self.assertEqual(u'foo1', nonint2.id) + self.assertEqual('foo1', nonint2.id) def test_force_pk(self): nonint1 = NonIntegerPkFactory.create(id='foo10') - self.assertEqual(u'foo10', nonint1.id) + self.assertEqual('foo10', nonint1.id) NonIntegerPkFactory.reset_sequence() nonint2 = NonIntegerPkFactory.create() - self.assertEqual(u'foo1', nonint2.id) + self.assertEqual('foo1', nonint2.id) -- cgit v1.2.3