From 943e4d37f512b8b28fe828e4e08289e94e025d18 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Sun, 20 Mar 2016 16:24:01 -0700
Subject: [PATCH] Run more connection tests in Docker.

Connection tests are now run before non_destructive to make sure
that the known_hosts file in our Docker image has not been removed.
---
 test/integration/Makefile                  | 14 +++++++++++---
 test/integration/test_connection.inventory | 10 ++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/test/integration/Makefile b/test/integration/Makefile
index c372316e20..f12cc03a0f 100644
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@@ -23,7 +23,7 @@ VAULT_PASSWORD_FILE = vault-password
 CONSUL_RUNNING := $(shell python consul_running.py)
 EUID := $(shell id -u -r)
 
-all: setup test_test_infra parsing test_var_precedence unicode test_templating_settings environment non_destructive destructive includes blocks pull check_mode test_hash test_handlers test_group_by test_vault test_tags test_lookup_paths no_log test_connection test_gathering_facts
+all: setup test_test_infra parsing test_var_precedence unicode test_templating_settings environment test_connection non_destructive destructive includes blocks pull check_mode test_hash test_handlers test_group_by test_vault test_tags test_lookup_paths no_log test_gathering_facts
 
 test_test_infra:
 	# ensure fail/assert work locally and can stop execution with non-zero exit code
@@ -82,13 +82,21 @@ environment: setup
 non_destructive: setup
 	ansible-playbook non_destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
 
+# For our Docker images, which identify themselves with "ENV container=docker", use the test_docker inventory group.
+# Otherwise use the test_default inventory group, which runs fewer tests, but should work on any system.
+ifeq ($(container),docker)
+TEST_CONNECTION_FILTER := 'test_docker'
+else
+TEST_CONNECTION_FILTER := 'test_default'
+endif
+
 # Skip connection plugins which require root when not running as root.
 ifneq ($(EUID),0)
-TEST_CONNECTION_FILTER := !chroot
+TEST_CONNECTION_FILTER += !chroot
 endif
 
 # Connection plugin test command to repeat with each locale setting.
-TEST_CONNECTION_CMD = $(1) ansible-playbook test_connection.yml -i test_connection.inventory -l '!skip-during-build $(TEST_CONNECTION_FILTER)' $(TEST_FLAGS)
+TEST_CONNECTION_CMD = $(1) ansible-playbook test_connection.yml -i test_connection.inventory -l '$(TEST_CONNECTION_FILTER)' $(TEST_FLAGS)
 
 test_connection: setup
 	$(call TEST_CONNECTION_CMD)
diff --git a/test/integration/test_connection.inventory b/test/integration/test_connection.inventory
index 261bd7020f..9e3ab602cb 100644
--- a/test/integration/test_connection.inventory
+++ b/test/integration/test_connection.inventory
@@ -48,9 +48,11 @@ paramiko_ssh-no-pipelining ansible_ssh_pipelining=false
 ansible_host=localhost
 ansible_connection=paramiko_ssh
 
-[skip-during-build:children]
-docker
-libvirt_lxc
-jail
+[test_default:children]
+local
+chroot
+
+[test_docker:children]
+test_default
 ssh
 paramiko_ssh