Skip to content

Commit

Permalink
Fix tests that didn't run.
Browse files Browse the repository at this point in the history
Previously, two tests would not run because I forgot to name them
to something that wasn't a copy/paste from another test.

I renamed them so they actually run.
  • Loading branch information
Matthew Spelchak committed Feb 9, 2018
1 parent 330b515 commit 966e053
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/galaxy/jobs/dynamic_tool_destination.py
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ def map_tool_to_destination(

if destination == "fail":
if fail_message:
raise JobMappingException(fail_message) ### Should an exception occur when there are no default destinations?
raise JobMappingException(fail_message) ### Should an exception occur when there are no default destinations? (maybe check for config[default_destination] size)
else:
raise JobMappingException(matched_rule["fail_message"])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ def test_rule_destination_not_in_job_conf(self, l):
)

@log_capture()
def test_tool_default_destination_not_in_job_conf(self, l):
def test_tool_default_destination_not_in_job_conf_with_no_rules(self, l):
dt.parse_yaml(path=yt.ivYMLTest151, job_conf_path=job_conf_path, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
Expand Down Expand Up @@ -696,7 +696,7 @@ def test_rule_destination_without_priority_not_in_job_conf(self, l):
)

@log_capture()
def test_tool_default_destination_without_priority_not_in_job_conf(self, l):
def test_tool_default_destination_without_priority_not_in_job_conf_with_no_rules(self, l):
dt.parse_yaml(path=yt.ivYMLTest154, job_conf_path=job_conf_path, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
Expand Down Expand Up @@ -748,7 +748,7 @@ def test_tool_default_destination_without_priority_not_in_job_conf(self, l):
('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', 'Finished config validation.')
)
)

# ================================Valid yaml files==============================
@log_capture()
Expand Down

0 comments on commit 966e053

Please sign in to comment.