Merge pull request #9952 from jmchilton/release_20.05_packages_0

[20.05] Various small fixes for galaxy packages.

packages/containers/tests/containers

@@ -0,0 +1 @@
+../../../test/unit/containers

packages/containers/tests/test_containers.py

@@ -1 +0,0 @@
-../../../test/unit/test_containers.py

packages/objectstore/requirements.txt

@@ -1 +1,2 @@
 galaxy-util
+pyyaml

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

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

test/unit/containers/test_containers.py

@@ -1,4 +1,5 @@
 import galaxy.containers
+import galaxy.containers.docker_model
 
 
 def test_dummy():