From 7c0026a6dfc2e0d596d1b80a82ddf0bbc03591a2 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 13 Jun 2014 00:58:23 -0500
Subject: [PATCH] Fix failing unit tests for 60d8de4.

---
 job_conf.xml.sample_advanced          | 2 +-
 lib/galaxy/tools/deps/containers.py   | 6 ++++++
 lib/galaxy/tools/deps/requirements.py | 4 ++--
 test/unit/tools_support.py            | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/job_conf.xml.sample_advanced b/job_conf.xml.sample_advanced
index b8552147858..534db32c683 100644
--- a/job_conf.xml.sample_advanced
+++ b/job_conf.xml.sample_advanced
@@ -153,7 +153,7 @@
           <!-- <param id="docker_sudo">false</param> -->
           <!-- Following option can be used to tweak sudo command used by
                default. -->
-          <!-- <param id="docker_sudo_cmd">/usr/bin/sudo --extra_param</param> -->
+          <!-- <param id="docker_sudo_cmd">/usr/bin/sudo -extra_param</param> -->
           <!-- By default, docker container will not have any networking
                enabled. host networking can be bridged by uncommenting next option
                http://docs.docker.io/reference/run/#network-settings
diff --git a/lib/galaxy/tools/deps/containers.py b/lib/galaxy/tools/deps/containers.py
index 3cab7bd54a2..0707c0ddea3 100644
--- a/lib/galaxy/tools/deps/containers.py
+++ b/lib/galaxy/tools/deps/containers.py
@@ -99,6 +99,12 @@ class ContainerFinder(object):
         return asbool(destination_info.get("%s_enabled" % container_type, False))
 
 
+class NullContainerFinder(object):
+
+    def find_container(self, tool_info, destination_info, job_info):
+        return []
+
+
 class ContainerRegistry():
 
     def __init__(self):
diff --git a/lib/galaxy/tools/deps/requirements.py b/lib/galaxy/tools/deps/requirements.py
index 3183c29ef13..73fa7f5f4e0 100644
--- a/lib/galaxy/tools/deps/requirements.py
+++ b/lib/galaxy/tools/deps/requirements.py
@@ -53,14 +53,14 @@ def parse_requirements_from_xml( xml_root ):
     ...     contents_document = '''<tool><requirements>%s</requirements></tool>'''
     ...     root = ElementTree.fromstring( contents_document % contents )
     ...     return parse_requirements_from_xml( root )
-    >>> reqs = load_requirements('''<requirement>bwa</requirement>''')
+    >>> reqs, containers = load_requirements('''<requirement>bwa</requirement>''')
     >>> reqs[0].name
     'bwa'
     >>> reqs[0].version is None
     True
     >>> reqs[0].type
     'package'
-    >>> reqs = load_requirements('''<requirement type="binary" version="1.3.3">cufflinks</requirement>''')
+    >>> reqs, containers = load_requirements('''<requirement type="binary" version="1.3.3">cufflinks</requirement>''')
     >>> reqs[0].name
     'cufflinks'
     >>> reqs[0].version
diff --git a/test/unit/tools_support.py b/test/unit/tools_support.py
index 30f7af70837..3e8243b8c2e 100644
--- a/test/unit/tools_support.py
+++ b/test/unit/tools_support.py
@@ -16,6 +16,7 @@ from galaxy.tools import Tool
 from galaxy.util import parse_xml
 from galaxy.util.dbkeys import GenomeBuilds
 from galaxy.jobs import NoopQueue
+from galaxy.tools.deps.containers import NullContainerFinder
 
 
 class UsesApp( object ):
@@ -126,6 +127,7 @@ class MockApp( object ):
         self.security_agent = GalaxyRBACAgent( self.model )
         self.tool_data_tables = {}
         self.dataset_collections_service = None
+        self.container_finder = NullContainerFinder()
 
 
 class MockContext(object):