x/turbo-hipster
Code Issues Proposed changes

Add a space after FAILURE message

Browse Source 
Change-Id: I47c6968f55b60ab479f951fa5079d1b82d074535
This commit is contained in:
Joshua Hesketh 2013-12-17 13:01:38 +11:00
parent a581752a93
commit 18ac7140ef
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/task_plugins/gate_real_db_upgrade/test_handle_results.py
View File

@ -64,7 +64,7 @@ class TestHandleResults(testtools.TestCase):
dataset_config)
self.assertFalse(result)
self.assertEqual(msg,
'FAILURE: Final schema version does not match '
'FAILURE - Final schema version does not match '
'expectation')
handle_results.find_schemas = lambda x: [228]

12
turbo_hipster/task_plugins/gate_real_db_upgrade/handle_results.py
View File

@ -101,16 +101,16 @@ def check_log_for_errors(logfile, gitpath, dataset_config):
warnings = []
for line in fd:
if 'ERROR 1045' in line:
return False, "FAILURE: Could not setup seed database."
return False, "FAILURE - Could not setup seed database."
elif 'ERROR 1049' in line:
return False, "FAILURE: Could not find seed database."
return False, "FAILURE - Could not find seed database."
elif 'ImportError' in line:
return False, "FAILURE: Could not import required module."
return False, "FAILURE - Could not import required module."
elif MIGRATION_START_RE.search(line):
if migration_started:
# We didn't see the last one finish,
# something must have failed
return False, ("FAILURE: Did not find the end of a "
return False, ("FAILURE - Did not find the end of a "
"migration after a start")
migration_started = True
@ -133,13 +133,13 @@ def check_log_for_errors(logfile, gitpath, dataset_config):
# Check the final version is as expected
final_version = MIGRATION_FINAL_SCHEMA_RE.findall(line)[0]
if int(final_version) != max(find_schemas(gitpath)):
return False, ("FAILURE: Final schema version does not "
return False, ("FAILURE - Final schema version does not "
"match expectation")
if migration_started:
# We never saw the end of a migration,
# something must have failed
return False, ("FAILURE: Did not find the end of a migration "
return False, ("FAILURE - Did not find the end of a migration "
"after a start")
elif len(warnings) > 0:
return False, ', '.join(warnings)