Skip to content

Commit

Permalink
remove references to waffles
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Spelchak committed Feb 19, 2018
1 parent da1f0f3 commit faed195
Show file tree
Hide file tree
Showing 3 changed files with 149 additions and 149 deletions.
14 changes: 7 additions & 7 deletions test/unit/jobs/dynamic_tool_destination/data/job_conf.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
<destination id="Destination5" runner="local"/>
<destination id="Destination6_med" runner="local"/>
<destination id="Destination6" runner="local"/>
<destination id="waffles_default_high" runner="local"/>
<destination id="waffles_default_med" runner="local"/>
<destination id="waffles_default_low" runner="local"/>
<destination id="waffles_high" runner="local"/>
<destination id="waffles_low" runner="local"/>
<destination id="waffles_low_4" runner="local"/>
<destination id="cluster_default_high" runner="local"/>
<destination id="cluster_default_med" runner="local"/>
<destination id="cluster_default_low" runner="local"/>
<destination id="cluster_high" runner="local"/>
<destination id="cluster_low" runner="local"/>
<destination id="cluster_low_4" runner="local"/>
<destination id="cluster_high_32" runner="local"/>
<destination id="cluster_low_4" runner="local"/>
<destination id="cluster_med_4" runner="local"/>
<destination id="waffles_default" runner="local"/>
<destination id="cluster_default" runner="local"/>
<destination id="DestinationF" runner="local"/>
<destination id="lame_cluster" runner="local"/>
<destination id="even_lamer_cluster" runner="local"/>
Expand Down
32 changes: 16 additions & 16 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 @@ -10,7 +10,7 @@
from . import mockGalaxy as mg
from . import ymltests as yt

theApp = mg.App("waffles_default", "test_spec")
theApp = mg.App("cluster_default", "test_spec")
script_dir = os.path.dirname(__file__)

# ======================Jobs====================================
Expand Down Expand Up @@ -186,20 +186,20 @@ def test_filesize_run(self, l):
@log_capture()
def test_default_tool(self, l):
job = map_tool_to_destination(runJob, theApp, defaultTool, "user@email.com", True, path, job_conf_path)
self.assertEquals(job, 'waffles_default')
self.assertEquals(job, 'cluster_default')
priority_job = map_tool_to_destination(runJob, theApp, defaultTool, "user@email.com", True, priority_path, job_conf_path)
self.assertEquals(priority_job, 'waffles_default_high')
self.assertEquals(priority_job, 'cluster_default_high')

l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Tool 'test_tooldefault' not specified in config. Using default destination."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'test_tooldefault' with 'waffles_default'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'test_tooldefault' with 'cluster_default'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "No default_priority section found in config. Setting 'med' as default priority."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Tool 'test_tooldefault' not specified in config. Using default destination."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'test_tooldefault' with 'waffles_default_high'.")
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'test_tooldefault' with 'cluster_default_high'.")
)

@log_capture()
Expand All @@ -222,37 +222,37 @@ def test_arguments_tool(self, l):
@log_capture()
def test_arguments_arg_not_found(self, l):
job = map_tool_to_destination(argNotFoundJob, theApp, argTool, "user@email.com", True, path, job_conf_path)
self.assertEquals(job, 'waffles_default')
self.assertEquals(job, 'cluster_default')
priority_job = map_tool_to_destination(argNotFoundJob, theApp, argTool, "user@email.com", True, priority_path, job_conf_path)
self.assertEquals(priority_job, 'waffles_default_high')
self.assertEquals(priority_job, 'cluster_default_high')

l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'test_arguments' with 'waffles_default'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'test_arguments' with 'cluster_default'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "No default_priority section found in config. Setting 'med' as default priority."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'test_arguments' with 'waffles_default_high'.")
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'test_arguments' with 'cluster_default_high'.")
)

@log_capture()
def test_tool_not_found(self, l):
job = map_tool_to_destination(runJob, theApp, unTool, "user@email.com", True, path, job_conf_path)
self.assertEquals(job, 'waffles_default')
self.assertEquals(job, 'cluster_default')
priority_job = map_tool_to_destination(runJob, theApp, unTool, "user@email.com", True, priority_path, job_conf_path)
self.assertEquals(priority_job, 'waffles_default_high')
self.assertEquals(priority_job, 'cluster_default_high')

l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Tool 'unregistered' not specified in config. Using default destination."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'unregistered' with 'waffles_default'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'unregistered' with 'cluster_default'."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "No default_priority section found in config. Setting 'med' as default priority."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Tool 'unregistered' not specified in config. Using default destination."),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'unregistered' with 'waffles_default_high'.")
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Running 'unregistered' with 'cluster_default_high'.")
)

@log_capture()
Expand Down Expand Up @@ -799,7 +799,7 @@ def test_typo_in_str_default_dest(self, l):
dt.parse_yaml(path=yt.ivYMLTest164, job_conf_path=job_conf_path, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination 'waffles-kow' does not appear in the job configuration. Did you mean 'waffles_low'?"),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination 'cluster-kow' does not appear in the job configuration. Did you mean 'cluster_low'?"),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -808,7 +808,7 @@ def test_typo_in_dict_default_dest(self, l):
dt.parse_yaml(path=yt.ivYMLTest165, job_conf_path=job_conf_path, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination 'waffles_kow' does not appear in the job configuration. Did you mean 'waffles_low'?"),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination 'cluster_kow' does not appear in the job configuration. Did you mean 'cluster_low'?"),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand All @@ -817,7 +817,7 @@ def test_typo_in_dict_tool_default_dest(self, l):
dt.parse_yaml(path=yt.ivYMLTest166, job_conf_path=job_conf_path, test=True)
l.check(
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination for 'blah': 'waffles_defaut' does not appear in the job configuration. Did you mean 'waffles_default'?"),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "Default destination for 'blah': 'cluster_defaut' does not appear in the job configuration. Did you mean 'cluster_default'?"),
('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
)

Expand Down

0 comments on commit faed195

Please sign in to comment.