CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-04 15:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed CleanerVersion layer [backwards-incompatible!]

Browse Source
This commit is contained in:
Raphael Michel
2015-12-12 13:08:33 +01:00
parent 0c9c9dd22c
commit d133d2abff
85 changed files with 712 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/base/test_locking.py
View File

@@ -21,7 +21,7 @@ def event():
def test_locking_exclusive(event):
with event.lock():
with pytest.raises(EventLock.LockTimeoutException):
ev = Event.objects.current.get(identity=event.identity)
ev = Event.objects.get(id=event.id)
with ev.lock():
pass
@@ -42,7 +42,7 @@ def test_lock_timeout_steal(event):
locking.LOCK_TIMEOUT = 5
locking.lock_event(event)
with pytest.raises(EventLock.LockTimeoutException):
ev = Event.objects.current.get(identity=event.identity)
ev = Event.objects.get(id=event.id)
locking.lock_event(ev)
time.sleep(6)
locking.lock_event(ev)

27
src/tests/base/test_models.py
View File

@@ -146,23 +146,6 @@ class ItemVariationsTest(TestCase):
self.assertEqual(num_variations, 1)
class VersionableTestCase(TestCase):
def test_shallow_cone(self):
o = Organizer.objects.create(name='Dummy', slug='dummy')
event = Event.objects.create(
organizer=o, name='Dummy', slug='dummy',
date_from=now(),
)
item = Item.objects.create(event=event, name='Dummy', default_price=14)
quota_old = Quota.objects.create(event=event, name='All', size=5)
quota_old.items.add(item)
quota_new = quota_old.clone_shallow()
self.assertIsNone(quota_new.version_end_date)
self.assertIsNotNone(quota_old.version_end_date)
self.assertEqual(quota_new.items.count(), 0)
self.assertEqual(quota_old.items.count(), 1)
class UserTestCase(TestCase):
def test_name(self):
u = User.objects.create_user('test@foo.bar', 'test')
@@ -336,14 +319,14 @@ class OrderTestCase(BaseQuotaTestCase):
self.quota.size = 0
self.quota.save()
mark_order_paid(self.order)
self.order = Order.objects.current.get(identity=self.order.identity)
self.order = Order.objects.get(id=self.order.id)
self.assertEqual(self.order.status, Order.STATUS_PAID)
def test_paid_expired_available(self):
self.order.expires = now() - timedelta(days=2)
self.order.save()
mark_order_paid(self.order)
self.order = Order.objects.current.get(identity=self.order.identity)
self.order = Order.objects.get(id=self.order.id)
self.assertEqual(self.order.status, Order.STATUS_PAID)
def test_paid_expired_partial(self):
@@ -356,7 +339,7 @@ class OrderTestCase(BaseQuotaTestCase):
self.assertFalse(True, 'This should have raised an exception.')
except Quota.QuotaExceededException:
pass
self.order = Order.objects.current.get(identity=self.order.identity)
self.order = Order.objects.get(id=self.order.id)
self.assertIn(self.order.status, (Order.STATUS_PENDING, Order.STATUS_EXPIRED))
def test_paid_expired_unavailable(self):
@@ -369,7 +352,7 @@ class OrderTestCase(BaseQuotaTestCase):
self.assertFalse(True, 'This should have raised an exception.')
except Quota.QuotaExceededException:
pass
self.order = Order.objects.current.get(identity=self.order.identity)
self.order = Order.objects.get(id=self.order.id)
self.assertIn(self.order.status, (Order.STATUS_PENDING, Order.STATUS_EXPIRED))
def test_paid_expired_unavailable_force(self):
@@ -378,7 +361,7 @@ class OrderTestCase(BaseQuotaTestCase):
self.quota.size = 0
self.quota.save()
mark_order_paid(self.order, force=True)
self.order = Order.objects.current.get(identity=self.order.identity)
self.order = Order.objects.get(id=self.order.id)
self.assertEqual(self.order.status, Order.STATUS_PAID)
def test_can_modify_answers(self):

29
src/tests/base/test_settings.py
View File

@@ -29,7 +29,7 @@ class SettingsTestCase(TestCase):
self.assertEqual(self.organizer.settings.test, 'foo')
# Reload object
self.organizer = Organizer.objects.get(identity=self.organizer.identity)
self.organizer = Organizer.objects.get(id=self.organizer.id)
self.assertEqual(self.organizer.settings.test, 'foo')
def test_event_set_explicit(self):
@@ -37,7 +37,7 @@ class SettingsTestCase(TestCase):
self.assertEqual(self.event.settings.test, 'foo')
# Reload object
self.event = Event.objects.get(identity=self.event.identity)
self.event = Event.objects.get(id=self.event.id)
self.assertEqual(self.event.settings.test, 'foo')
def test_event_set_twice(self):
@@ -46,7 +46,7 @@ class SettingsTestCase(TestCase):
self.assertEqual(self.event.settings.test, 'foo')
# Reload object
self.event = Event.objects.get(identity=self.event.identity)
self.event = Event.objects.get(id=self.event.id)
self.assertEqual(self.event.settings.test, 'foo')
def test_event_set_on_organizer(self):
@@ -55,18 +55,7 @@ class SettingsTestCase(TestCase):
self.assertEqual(self.event.settings.test, 'foo')
# Reload object
self.organizer = Organizer.objects.get(identity=self.organizer.identity)
def test_versioning(self):
self.organizer.settings.test = 'foo'
t1 = now()
self.assertEqual(self.organizer.settings.test, 'foo')
self.assertEqual(self.event.settings.test, 'foo')
self.organizer.settings.test = 'bar'
assert OrganizerSetting.objects.as_of(t1).get(object=self.organizer, key='test').value == 'foo'
assert OrganizerSetting.objects.current.get(object=self.organizer, key='test').value == 'bar'
self.organizer = Organizer.objects.get(id=self.organizer.id)
def test_override_organizer(self):
self.organizer.settings.test = 'foo'
@@ -75,8 +64,8 @@ class SettingsTestCase(TestCase):
self.assertEqual(self.event.settings.test, 'bar')
# Reload object
self.organizer = Organizer.objects.get(identity=self.organizer.identity)
self.event = Event.objects.get(identity=self.event.identity)
self.organizer = Organizer.objects.get(id=self.organizer.id)
self.event = Event.objects.get(id=self.event.id)
self.assertEqual(self.organizer.settings.test, 'foo')
self.assertEqual(self.event.settings.test, 'bar')
@@ -103,13 +92,13 @@ class SettingsTestCase(TestCase):
del self.event.settings.test
self.assertEqual(self.event.settings.test, 'foo')
self.event = Event.objects.get(identity=self.event.identity)
self.event = Event.objects.get(id=self.event.id)
self.assertEqual(self.event.settings.test, 'foo')
del self.organizer.settings.test
self.assertIsNone(self.organizer.settings.test)
self.organizer = Organizer.objects.get(identity=self.organizer.identity)
self.organizer = Organizer.objects.get(id=self.organizer.id)
self.assertIsNone(self.organizer.settings.test)
def test_serialize_str(self):
@@ -196,7 +185,7 @@ class SettingsTestCase(TestCase):
sandbox['bar'] = 'baz'
sandbox.baz = 42
self.event = Event.objects.get(identity=self.event.identity)
self.event = Event.objects.get(id=self.event.id)
sandbox = SettingsSandbox('testing', 'foo', self.event)
self.assertEqual(sandbox['bar'], 'baz')
self.assertEqual(sandbox.baz, '42')