Skip to content

Commit

Permalink
Make all error messages start with capitals, and adjust the tests to …
Browse files Browse the repository at this point in the history 
…expect this
  • Loading branch information
Matthew Spelchak committed Feb 7, 2018
1 parent ec3bb7d commit 25e50cf
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
22 changes: 11 additions & 11 deletions lib/galaxy/jobs/dynamic_tool_destination.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ def __validate_destination(cls, valid_rule, return_bool, rule, tool, counter):
log.debug(error)
valid_rule = False
elif rule["destination"] not in destination_list and rule["destination"] != "fail":
error = "destination for '" + str(tool) + "', rule "
error = "Destination for '" + str(tool) + "', rule "
error += str(counter) + ": '"
error += str(rule["destination"])
error += "' does not exist in job configuration."
Expand All @@ -421,7 +421,7 @@ def __validate_destination(cls, valid_rule, return_bool, rule, tool, counter):

for priority in rule["destination"]["priority"]:
if priority not in priority_list:
error = "invalid priority '"
error = "Invalid priority '"
error += str(priority) + "' for rule "
error += str(counter) + " in '" + str(tool) +"'."
if not return_bool:
Expand All @@ -442,7 +442,7 @@ def __validate_destination(cls, valid_rule, return_bool, rule, tool, counter):
valid_rule = False

elif rule["destination"]["priority"][priority] not in destination_list:
error = "destination for '" + str(tool) + "', rule "
error = "Destination for '" + str(tool) + "', rule "
error += str(counter) + ": '"
error += str(rule["destination"]["priority"][priority])
error += "' does not exist in job configuration."
Expand Down Expand Up @@ -793,7 +793,7 @@ def infinite_defaultdict():
if obj['default_destination'] in destination_list:
new_config["default_destination"] = obj['default_destination']
else:
error = ("default destination '" +
error = ("Default destination '" +
obj['default_destination'] +
"' does not appear in the job configuration.")
if verbose:
Expand All @@ -815,7 +815,7 @@ def infinite_defaultdict():
new_config['default_destination']['priority'][priority] = obj[
'default_destination']['priority'][priority]
else:
error = ("default destination '" +
error = ("Default destination '" +
obj['default_destination']['priority'][priority] +
"' does not appear in the job configuration.")
if verbose:
Expand Down Expand Up @@ -904,7 +904,7 @@ def infinite_defaultdict():
new_config['tools'][tool]['default_destination'] = (curr['default_destination'])
tool_has_default = True
else:
error = ("default destination for '" +
error = ("Default destination for '" +
str(tool) + "': '" +
curr['default_destination'] +
"' does not appear in the job configuration.")
Expand All @@ -918,7 +918,7 @@ def infinite_defaultdict():
### May not be necessary check if something has all priorities specified as default
for priority in priority_list:
if priority not in curr['default_destination']['priority']:
error = ("no default for destination for priority '" +
error = ("No default for destination for priority '" +
str(priority) + "' in '" + str(tool)) + "'."
if verbose:
log.debug(error)
Expand All @@ -933,30 +933,30 @@ def infinite_defaultdict():
'priority'][priority] = destination
tool_has_default = True
else:
error = ("default destination for '" +
error = ("Default destination for '" +
str(tool) + "': '" +
destination + "' does not appear " +
"in the job configuration.")
if verbose:
log.debug(error)
valid_config = False
else:
error = ("no default '" + str(priority) +
error = ("No default '" + str(priority) +
"' priority destination for tool " +
str(tool) + " in config!")
if verbose:
log.debug(error)
valid_config = False

else:
error = ("invalid default destination priority '" +
error = ("Invalid default destination priority '" +
str(priority) + "' for '" + str(tool) +
"'.")
if verbose:
log.debug(error)
valid_config = False
else:
error = "no default priority destinations specified"
error = "No default priority destinations specified"
error += " for " + str(tool) + " in config!"
if verbose:
log.debug(error)
Expand Down
24 changes: 12 additions & 12 deletions test/unit/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ def test_tool_without_low_default_destination(self, l):
dt.parse_yaml(path=yt.ivYMLTest146, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "invalid priority 'low' for rule 1 in 'smalt'. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Invalid priority 'low' for rule 1 in 'smalt'. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -660,7 +660,7 @@ def test_tool_with_invalid_priority_destination(self, l):
dt.parse_yaml(path=yt.ivYMLTest147, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "invalid priority 'mine' for rule 1 in 'smalt'. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Invalid priority 'mine' for rule 1 in 'smalt'. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -671,8 +671,8 @@ def test_not_all_priorities_in_tool(self, l):
dt.parse_yaml(path=yt.ivYMLTest149, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "no default for destination for priority 'lowish' in 'yuck'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "no default for destination for priority 'higher' in 'yuck'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "No default for destination for priority 'lowish' in 'yuck'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "No default for destination for priority 'higher' in 'yuck'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -681,7 +681,7 @@ def test_rule_destination_not_in_job_conf(self, l): ### Also test when desinati
dt.parse_yaml(path=yt.ivYMLTest150, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "destination for 'blegh', rule 1: 'fake_destination' does not exist in job configuration. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Destination for 'blegh', rule 1: 'fake_destination' does not exist in job configuration. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -690,7 +690,7 @@ def test_tool_default_destination_not_in_job_conf(self, l):
dt.parse_yaml(path=yt.ivYMLTest151, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "default destination for 'blah': 'not_true_destination' does not appear in the job configuration."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination for 'blah': 'not_true_destination' does not appear in the job configuration."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -699,7 +699,7 @@ def test_default_destination_not_in_job_conf(self, l):
dt.parse_yaml(path=yt.ivYMLTest152, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "default destination 'no_such_dest' does not appear in the job configuration."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination 'no_such_dest' does not appear in the job configuration."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -708,7 +708,7 @@ def test_rule_destination_without_priority_not_in_job_conf(self, l):
dt.parse_yaml(path=yt.ivYMLTest153, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "destination for 'blegh', rule 1: 'fake_destination' does not exist in job configuration. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Destination for 'blegh', rule 1: 'fake_destination' does not exist in job configuration. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -717,7 +717,7 @@ def test_tool_default_destination_without_priority_not_in_job_conf(self, l):
dt.parse_yaml(path=yt.ivYMLTest154, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "default destination for 'blah': 'not_true_destination' does not appear in the job configuration."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination for 'blah': 'not_true_destination' does not appear in the job configuration."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -726,7 +726,7 @@ def test_default_destination_without_priority_not_in_job_conf(self, l):
dt.parse_yaml(path=yt.ivYMLTest155, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "default destination 'no_such_dest' does not appear in the job configuration."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination 'no_such_dest' does not appear in the job configuration."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -735,7 +735,7 @@ def test_tool_rule_priority_does_not_exist(self, l):
dt.parse_yaml(path=yt.ivYMLTest156, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "invalid priority 'notAPriority' for rule 1 in 'aTool'. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Invalid priority 'notAPriority' for rule 1 in 'aTool'. Ignoring..."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -744,7 +744,7 @@ def test_tool_default_destination_priority_does_not_exist(self, l):
dt.parse_yaml(path=yt.ivYMLTest157, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "invalid default destination priority 'notAPriority' for 'aTool'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Invalid default destination priority 'notAPriority' for 'aTool'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand Down

0 comments on commit 25e50cf

Please sign in to comment.