Reformat all the things

Python code is now formatted to PEP8

All other files are defined in .editorconfig as far as possible.
This commit is contained in:
Tom Price
2016-08-09 19:42:39 +01:00
parent 024f08562b
commit 567f899a39
75 changed files with 3606 additions and 2667 deletions

View File

@@ -47,7 +47,10 @@ class TestAdminMergeObjects(TestCase):
def setUp(self):
self.profile.set_password('testuser')
self.profile.save()
self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
self.assertTrue(
self.client.login(
username=self.profile.username,
password='testuser'))
def test_merge_confirmation(self):
change_url = reverse('admin:RIGS_venue_changelist')
@@ -89,10 +92,16 @@ class TestAdminMergeObjects(TestCase):
self.assertTrue(models.Venue.objects.get(pk=self.venues[1].pk))
# Check the un-needed venue has been disposed of
self.assertRaises(ObjectDoesNotExist, models.Venue.objects.get, pk=self.venues[2].pk)
self.assertRaises(
ObjectDoesNotExist,
models.Venue.objects.get,
pk=self.venues[2].pk)
# Check the one we didn't delete is still there
self.assertEqual(models.Venue.objects.get(pk=self.venues[3].pk), self.venues[3])
self.assertEqual(
models.Venue.objects.get(
pk=self.venues[3].pk),
self.venues[3])
# Check the events have been moved to the master venue
for key, event in self.events.iteritems():
@@ -118,10 +127,16 @@ class TestAdminMergeObjects(TestCase):
self.assertTrue(models.Person.objects.get(pk=self.persons[1].pk))
# Check the un-needed people have been disposed of
self.assertRaises(ObjectDoesNotExist, models.Person.objects.get, pk=self.persons[2].pk)
self.assertRaises(
ObjectDoesNotExist,
models.Person.objects.get,
pk=self.persons[2].pk)
# Check the one we didn't delete is still there
self.assertEqual(models.Person.objects.get(pk=self.persons[3].pk), self.persons[3])
self.assertEqual(
models.Person.objects.get(
pk=self.persons[3].pk),
self.persons[3])
# Check the events have been moved to the master person
for key, event in self.events.iteritems():
@@ -144,25 +159,40 @@ class TestAdminMergeObjects(TestCase):
self.assertContains(response, self.organisations[1].name)
# Check the master copy still exists
self.assertTrue(models.Organisation.objects.get(pk=self.organisations[1].pk))
self.assertTrue(
models.Organisation.objects.get(
pk=self.organisations[1].pk))
# Check the un-needed organisations have been disposed of
self.assertRaises(ObjectDoesNotExist, models.Organisation.objects.get, pk=self.organisations[2].pk)
self.assertRaises(
ObjectDoesNotExist,
models.Organisation.objects.get,
pk=self.organisations[2].pk)
# Check the one we didn't delete is still there
self.assertEqual(models.Organisation.objects.get(pk=self.organisations[3].pk), self.organisations[3])
self.assertEqual(
models.Organisation.objects.get(
pk=self.organisations[3].pk),
self.organisations[3])
# Check the events have been moved to the master organisation
for key, event in self.events.iteritems():
updatedEvent = models.Event.objects.get(pk=event.pk)
if event.organisation == self.organisations[3]: # The one we left in place
if event.organisation == self.organisations[
3]: # The one we left in place
continue
self.assertEqual(updatedEvent.organisation, self.organisations[1])
class TestInvoiceDelete(TestCase):
@classmethod
def setUpTestData(cls):
cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True)
cls.profile = models.Profile.objects.create(
username="testuser1",
email="1@test.com",
is_superuser=True,
is_active=True,
is_staff=True)
cls.events = {
1: models.Event.objects.create(name="TE E1", start_date=date.today()),
@@ -175,16 +205,22 @@ class TestInvoiceDelete(TestCase):
}
cls.payments = {
1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34, method=models.Payment.CASH)
1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34,
method=models.Payment.CASH)
}
def setUp(self):
self.profile.set_password('testuser')
self.profile.save()
self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
self.assertTrue(
self.client.login(
username=self.profile.username,
password='testuser'))
def test_invoice_delete_allowed(self):
request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[2].pk})
request_url = reverse(
'invoice_delete', kwargs={
'pk': self.invoices[2].pk})
response = self.client.get(request_url, follow=True)
self.assertContains(response, "Are you sure")
@@ -196,13 +232,20 @@ class TestInvoiceDelete(TestCase):
response = self.client.post(request_url, follow=True)
# Check the invoice is deleted
self.assertRaises(ObjectDoesNotExist, models.Invoice.objects.get, pk=self.invoices[2].pk)
self.assertRaises(
ObjectDoesNotExist,
models.Invoice.objects.get,
pk=self.invoices[2].pk)
def test_invoice_delete_not_allowed(self):
request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[1].pk})
request_url = reverse(
'invoice_delete', kwargs={
'pk': self.invoices[1].pk})
response = self.client.get(request_url, follow=True)
self.assertContains(response, "To delete an invoice, delete the payments first.")
self.assertContains(
response,
"To delete an invoice, delete the payments first.")
# Check the invoice still exists
self.assertTrue(models.Invoice.objects.get(pk=self.invoices[1].pk))
@@ -213,6 +256,7 @@ class TestInvoiceDelete(TestCase):
# Check this didn't work
self.assertTrue(models.Invoice.objects.get(pk=self.invoices[1].pk))
class TestSampleDataGenerator(TestCase):
@override_settings(DEBUG=True)
def test_generate_sample_data(self):
@@ -225,4 +269,8 @@ class TestSampleDataGenerator(TestCase):
def test_production_exception(self):
from django.core.management.base import CommandError
self.assertRaisesRegexp(CommandError, ".*production", call_command, 'generateSampleData')
self.assertRaisesRegexp(
CommandError,
".*production",
call_command,
'generateSampleData')