From ba7f48abf12afd026782df2667bc77f321d2ebe5 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 18 Apr 2016 11:27:39 -0400 Subject: [PATCH] Updating tests around data preload --- .../tests/old/commands/commands_monolithic.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/awx/main/tests/old/commands/commands_monolithic.py b/awx/main/tests/old/commands/commands_monolithic.py index 869b530ac9..ba65385139 100644 --- a/awx/main/tests/old/commands/commands_monolithic.py +++ b/awx/main/tests/old/commands/commands_monolithic.py @@ -191,32 +191,23 @@ class CreateDefaultOrgTest(BaseCommandMixin, BaseTest): def setUp(self): super(CreateDefaultOrgTest, self).setUp() + self.setup_instances() def test_create_default_org(self): self.setup_users() self.assertEqual(Organization.objects.count(), 0) - result, stdout, stderr = self.run_command('create_default_org') + result, stdout, stderr = self.run_command('create_preload_data') self.assertEqual(result, None) self.assertTrue('Default organization added' in stdout) self.assertEqual(Organization.objects.count(), 1) org = Organization.objects.all()[0] self.assertEqual(org.created_by, self.super_django_user) self.assertEqual(org.modified_by, self.super_django_user) - result, stdout, stderr = self.run_command('create_default_org') + result, stdout, stderr = self.run_command('create_preload_data') self.assertEqual(result, None) self.assertFalse('Default organization added' in stdout) self.assertEqual(Organization.objects.count(), 1) - def test_create_default_org_when_no_superuser_exists(self): - self.assertEqual(Organization.objects.count(), 0) - result, stdout, stderr = self.run_command('create_default_org') - self.assertEqual(result, None) - self.assertTrue('Default organization added' in stdout) - self.assertEqual(Organization.objects.count(), 1) - org = Organization.objects.all()[0] - self.assertEqual(org.created_by, None) - self.assertEqual(org.modified_by, None) - class DumpDataTest(BaseCommandMixin, BaseTest): ''' Test cases for dumpdata management command.