Skip to content

Commit

Permalink
Enable more FreeBSD integration tests. (ansible#16991)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattclay authored Aug 8, 2016
1 parent 420a2f1 commit d2fb845
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
8 changes: 4 additions & 4 deletions test/integration/roles/test_template/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@
# VERIFY dest as a directory does not break file attributes
# Note: expanduser is needed to go down the particular codepath that was broken before
- name: setup directory for test
file: state=directory dest={{output_dir | expanduser}}/template-dir mode=0755 owner=nobody group=root
file: state=directory dest={{output_dir | expanduser}}/template-dir mode=0755 owner=nobody group={{ ansible_env.GROUP | default('root') }}

- name: set file mode when the destination is a directory
template: src=foo.j2 dest={{output_dir | expanduser}}/template-dir/ mode=0600 owner=root group=root
template: src=foo.j2 dest={{output_dir | expanduser}}/template-dir/ mode=0600 owner=root group={{ ansible_env.GROUP | default('root') }}

- name: set file mode when the destination is a directory
template: src=foo.j2 dest={{output_dir | expanduser}}/template-dir/ mode=0600 owner=root group=root
template: src=foo.j2 dest={{output_dir | expanduser}}/template-dir/ mode=0600 owner=root group={{ ansible_env.GROUP | default('root') }}
register: file_result

- name: check that the file has the correct attributes
Expand All @@ -103,7 +103,7 @@
- "dir_attrs.stat.mode == '0755'"

- name: Check that template to a dirctory where the directory does not end with a / is allowed
template: src=foo.j2 dest={{output_dir | expanduser}}/template-dir mode=0600 owner=root group=root
template: src=foo.j2 dest={{output_dir | expanduser}}/template-dir mode=0600 owner=root group={{ ansible_env.GROUP | default('root') }}

- name: make a symlink to the templated file
file:
Expand Down
7 changes: 6 additions & 1 deletion test/utils/shippable/remote-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test_flags="${TEST_FLAGS:-}"
force_color="${FORCE_COLOR:-1}"

# FIXME: these tests fail
skip_tags='test_copy,test_template,test_unarchive,test_command_shell,test_service,test_postgresql,test_mysql_db,test_mysql_user,test_mysql_variables,test_uri,test_get_url'
skip_tags='test_unarchive,test_service,test_postgresql,test_mysql_db,test_mysql_user,test_mysql_variables,test_uri,test_get_url'

cd ~/

Expand Down Expand Up @@ -56,6 +56,11 @@ if [ ! -f /bin/true ]; then
ln -s /usr/bin/true /bin/true
fi

# FIXME: tests assume sha1sum is available (some platforms have shasum instead)
if [ ! -f /usr/local/bin/sha1sum ]; then
ln -s /usr/local/bin/shasum /usr/local/bin/sha1sum
fi

# FIXME: async doesn't work with ansible_python_interpreter, see: https://github.com/ansible/ansible/issues/14101
if [ ! -f /usr/bin/python ]; then
ln -s /usr/local/bin/python /usr/bin/python
Expand Down

0 comments on commit d2fb845

Please sign in to comment.