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

Clean up ansible-test references in tests. (#60108)

Browse source 
* Clean up comments in integration tests.

Tests reference soon to be outdated paths and implementation details.

* Remove unused test/runner/ reference in test.
This commit is contained in:
Matt Clay 2019-08-05 14:55:30 -07:00 committed by GitHub
parent 5e0bcc60b5
commit 9fd244319e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/integration/targets/consul/tasks/main.yml
View file

@ -74,8 +74,6 @@
- vars: - vars:
remote_dir: '{{ echo_output_dir.stdout }}' remote_dir: '{{ echo_output_dir.stdout }}'
block: block:
# output_dir is hardcoded/created in test/runner/lib/executor.py and
# contains '~': expand remote path
- command: 'echo {{ output_dir }}' - command: 'echo {{ output_dir }}'
register: echo_output_dir register: echo_output_dir

1
test/integration/targets/copy/tasks/main.yml
View file

@ -7,7 +7,6 @@
- set_fact: - set_fact:
local_temp_dir: '{{ tempfile_result.stdout }}' local_temp_dir: '{{ tempfile_result.stdout }}'
# output_dir is hardcoded in test/runner/lib/executor.py and created there
remote_dir: '{{ output_dir }}' remote_dir: '{{ output_dir }}'
symlinks: symlinks:
ansible-test-abs-link: /tmp/ansible-test-abs-link ansible-test-abs-link: /tmp/ansible-test-abs-link

2
test/integration/targets/supervisorctl/tasks/main.yml
View file

@ -1,6 +1,4 @@
- block: - block:
# output_dir is hardcoded in test/runner/lib/executor.py and created there
# expand remote path
- command: 'echo {{ output_dir }}' - command: 'echo {{ output_dir }}'
register: echo register: echo
- set_fact: - set_fact:

2
test/units/module_utils/facts/other/test_facter.py
View file

@ -30,7 +30,7 @@ facter_json_output = '''
"operatingsystemmajrelease": "25", "operatingsystemmajrelease": "25",
"hardwareisa": "x86_64", "hardwareisa": "x86_64",
"kernel": "Linux", "kernel": "Linux",
"path": "/home/testuser/src/ansible/bin:/home/testuser/src/ansible/test/runner:/home/testuser/perl5/bin:/home/testuser/perl5/bin:/home/testuser/bin:/home/testuser/.local/bin:/home/testuser/pythons/bin:/usr/lib64/qt-3.3/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/testuser/.cabal/bin:/home/testuser/gopath/bin:/home/testuser/.rvm/bin", "path": "/home/testuser/src/ansible/bin:/home/testuser/perl5/bin:/home/testuser/perl5/bin:/home/testuser/bin:/home/testuser/.local/bin:/home/testuser/pythons/bin:/usr/lib64/qt-3.3/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/testuser/.cabal/bin:/home/testuser/gopath/bin:/home/testuser/.rvm/bin",
"memorysize": "15.36 GB", "memorysize": "15.36 GB",
"memoryfree": "4.88 GB", "memoryfree": "4.88 GB",
"swapsize": "7.70 GB", "swapsize": "7.70 GB",