From 1dc11a25bad9f9103e5197ffef7dbba8febc3e3f Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 3 Jul 2020 12:29:36 -0400
Subject: [PATCH 1/3] Fix requirements for galaxy-objectstore.

---
 packages/objectstore/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/objectstore/requirements.txt b/packages/objectstore/requirements.txt
index 623c4906bb2..c3d75e0c839 100644
--- a/packages/objectstore/requirements.txt
+++ b/packages/objectstore/requirements.txt
@@ -1 +1,2 @@
 galaxy-util
+pyyaml

From 78fb5e226f17ab486ff407f708f7852b78fdb0db Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 3 Jul 2020 12:29:57 -0400
Subject: [PATCH 2/3] Fix Makefile test command for packages

---
 packages/package.Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/package.Makefile b/packages/package.Makefile
index 8b5a332977e..a86b62648b8 100644
--- a/packages/package.Makefile
+++ b/packages/package.Makefile
@@ -12,7 +12,7 @@ VERSION?=$(shell DEV_RELEASE=$(DEV_RELEASE) python $(BUILD_SCRIPTS_DIR)/print_ve
 PROJECT_NAME?="galaxy-$(shell basename $(CURDIR))"
 PROJECT_NAME:=$(subst _,-,$(PROJECT_NAME))
 BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
-TEST_DIR?=test
+TEST_DIR?=tests
 TESTS?=$(SOURCE_DIR) $(TEST_DIR)
 
 .PHONY: clean-pyc clean-build docs clean

From b883856c8dea1f88ad509e02c164ec43c274e1d4 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 3 Jul 2020 12:37:12 -0400
Subject: [PATCH 3/3] Fix galaxy-containers unit tests.

---
 packages/containers/tests/__init__.py         | 0
 packages/containers/tests/containers          | 1 +
 packages/containers/tests/test_containers.py  | 1 -
 packages/test.sh                              | 2 +-
 test/unit/containers/__init__.py              | 0
 test/unit/{ => containers}/test_containers.py | 1 +
 6 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 packages/containers/tests/__init__.py
 create mode 120000 packages/containers/tests/containers
 delete mode 120000 packages/containers/tests/test_containers.py
 create mode 100644 test/unit/containers/__init__.py
 rename test/unit/{ => containers}/test_containers.py (86%)

diff --git a/packages/containers/tests/__init__.py b/packages/containers/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packages/containers/tests/containers b/packages/containers/tests/containers
new file mode 120000
index 00000000000..5efd00dbb90
--- /dev/null
+++ b/packages/containers/tests/containers
@@ -0,0 +1 @@
+../../../test/unit/containers
\ No newline at end of file
diff --git a/packages/containers/tests/test_containers.py b/packages/containers/tests/test_containers.py
deleted file mode 120000
index 2fb68299fa1..00000000000
--- a/packages/containers/tests/test_containers.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../test/unit/test_containers.py
\ No newline at end of file
diff --git a/packages/test.sh b/packages/test.sh
index 2f7a62af826..db9563d69ae 100755
--- a/packages/test.sh
+++ b/packages/test.sh
@@ -31,7 +31,7 @@ PACKAGE_DIRS=(
     app
     web_apps
 )
-# containers has no tests, tool_util not yet working 100%,
+# tool_util not yet working 100%,
 # data has many problems quota, tool shed install database, etc..
 RUN_TESTS=(1 1 1 1 1 1 1 1 0 0 0 0)
 for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do
diff --git a/test/unit/containers/__init__.py b/test/unit/containers/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/unit/test_containers.py b/test/unit/containers/test_containers.py
similarity index 86%
rename from test/unit/test_containers.py
rename to test/unit/containers/test_containers.py
index 965d30fae00..5bfb271a62f 100644
--- a/test/unit/test_containers.py
+++ b/test/unit/containers/test_containers.py
@@ -1,4 +1,5 @@
 import galaxy.containers
+import galaxy.containers.docker_model
 
 
 def test_dummy():