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

AC-596 Fix for inventory import traceback.

Browse Source
This commit is contained in:
Chris Church
2013-10-31 15:04:57 -04:00
parent 9e9d696c79
commit 15f337d183
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/management/commands/inventory_import.py
View File

@@ -363,7 +363,7 @@ def load_inventory_source(source, all_group=None):
logger.debug('Analyzing type of source: %s', source) logger.debug('Analyzing type of source: %s', source)
original_all_group = all_group original_all_group = all_group
if not os.path.exists(source): if not os.path.exists(source):
raise CommandError('Source does not exist: %s' % source) raise IOError('Source does not exist: %s' % source)
if os.path.isdir(source): if os.path.isdir(source):
all_group = all_group or MemGroup('all', source) all_group = all_group or MemGroup('all', source)
for filename in glob.glob(os.path.join(source, '*')): for filename in glob.glob(os.path.join(source, '*')):
@@ -421,7 +421,7 @@ class Command(NoArgsCommand):
class Formatter(logging.Formatter): class Formatter(logging.Formatter):
def format(self, record): def format(self, record):
record.relativeSeconds = record.relativeCreated / 1000.0 record.relativeSeconds = record.relativeCreated / 1000.0
return super(Formatter, self).format(record) return logging.Formatter.format(self, record)
formatter = Formatter('%(relativeSeconds)9.3f %(levelname)-8s %(message)s') formatter = Formatter('%(relativeSeconds)9.3f %(levelname)-8s %(message)s')
handler.setFormatter(formatter) handler.setFormatter(formatter)
self.logger.addHandler(handler) self.logger.addHandler(handler)

2
awx/main/tests/commands.py
View File

@@ -514,7 +514,7 @@ class InventoryImportTest(BaseCommandMixin, BaseLiveServerTest):
result, stdout, stderr = self.run_command('inventory_import', result, stdout, stderr = self.run_command('inventory_import',
inventory_id=inventory_id, inventory_id=inventory_id,
source=invalid_source) source=invalid_source)
self.assertTrue(isinstance(result, CommandError), result) self.assertTrue(isinstance(result, IOError), result)
self.assertTrue('not exist' in str(result)) self.assertTrue('not exist' in str(result))
# Invalid inventory ID. # Invalid inventory ID.
invalid_id = Inventory.objects.order_by('-pk')[0].pk + 1 invalid_id = Inventory.objects.order_by('-pk')[0].pk + 1