External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

flake8

Browse Source
This commit is contained in:
Chris Meyers
2015-05-20 08:23:11 -04:00
parent e6b834c494
commit 51afab566b
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/inventory.py
View File

@@ -1254,8 +1254,8 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions):
if not super(InventoryUpdate, self).can_start: if not super(InventoryUpdate, self).can_start:
return False return False
if self.source != 'custom' \ if (self.source != 'custom'
and not (self.credential and self.credential.active): and not (self.credential and self.credential.active)):
return False return False
return True return True

32
awx/main/tests/tasks.py
View File

@@ -347,22 +347,22 @@ class RunJobTest(BaseJobExecutionTest):
def setUp(self): def setUp(self):
with ignore_inventory_computed_fields(): with ignore_inventory_computed_fields():
super(RunJobTest, self).setUp() super(RunJobTest, self).setUp()
self.test_project_path = None self.test_project_path = None
self.setup_instances() self.setup_instances()
self.setup_users() self.setup_users()
self.organization = self.make_organizations(self.super_django_user, 1)[0] self.organization = self.make_organizations(self.super_django_user, 1)[0]
self.inventory = self.organization.inventories.create(name='test-inventory', self.inventory = self.organization.inventories.create(name='test-inventory',
description='description for test-inventory') description='description for test-inventory')
self.host = self.inventory.hosts.create(name='host.example.com') self.host = self.inventory.hosts.create(name='host.example.com')
self.group = self.inventory.groups.create(name='test-group') self.group = self.inventory.groups.create(name='test-group')
self.group2 = self.inventory.groups.create(name='test-group2') self.group2 = self.inventory.groups.create(name='test-group2')
self.group.hosts.add(self.host) self.group.hosts.add(self.host)
self.group2.hosts.add(self.host) self.group2.hosts.add(self.host)
self.project = None self.project = None
self.credential = None self.credential = None
self.cloud_credential = None self.cloud_credential = None
settings.INTERNAL_API_URL = self.live_server_url settings.INTERNAL_API_URL = self.live_server_url
def tearDown(self): def tearDown(self):
super(RunJobTest, self).tearDown() super(RunJobTest, self).tearDown()