cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #15132 from mattclay/travis-connection-tests

Browse source 
Run more connection tests in Docker.
This commit is contained in:
James Cammarata 2016-03-24 09:31:26 -04:00
commit e11446490e
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
test/integration/Makefile
View file

@ -23,7 +23,7 @@ VAULT_PASSWORD_FILE = vault-password
CONSUL_RUNNING := $(shell python consul_running.py) CONSUL_RUNNING := $(shell python consul_running.py)
EUID := $(shell id -u -r) 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: test_test_infra:
# ensure fail/assert work locally and can stop execution with non-zero exit code # ensure fail/assert work locally and can stop execution with non-zero exit code
@ -82,13 +82,21 @@ environment: setup
non_destructive: setup non_destructive: setup
ansible-playbook non_destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) 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. # Skip connection plugins which require root when not running as root.
ifneq ($(EUID),0) ifneq ($(EUID),0)
TEST_CONNECTION_FILTER := !chroot TEST_CONNECTION_FILTER += !chroot
endif endif
# Connection plugin test command to repeat with each locale setting. # 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 test_connection: setup
$(call TEST_CONNECTION_CMD) $(call TEST_CONNECTION_CMD)

10
test/integration/test_connection.inventory
View file

@ -48,9 +48,11 @@ paramiko_ssh-no-pipelining ansible_ssh_pipelining=false
ansible_host=localhost ansible_host=localhost
ansible_connection=paramiko_ssh ansible_connection=paramiko_ssh
[skip-during-build:children] [test_default:children]
docker local
libvirt_lxc chroot
jail
[test_docker:children]
test_default
ssh ssh
paramiko_ssh paramiko_ssh