From 9fd244319eb9fd5897a1cae3cacf87564abf29e9 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 5 Aug 2019 14:55:30 -0700 Subject: [PATCH] Clean up ansible-test references in tests. (#60108) * Clean up comments in integration tests. Tests reference soon to be outdated paths and implementation details. * Remove unused test/runner/ reference in test. --- test/integration/targets/consul/tasks/main.yml | 2 -- test/integration/targets/copy/tasks/main.yml | 1 - test/integration/targets/supervisorctl/tasks/main.yml | 2 -- test/units/module_utils/facts/other/test_facter.py | 2 +- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/test/integration/targets/consul/tasks/main.yml b/test/integration/targets/consul/tasks/main.yml index 34ee463bbc6..575c2ed9fbc 100644 --- a/test/integration/targets/consul/tasks/main.yml +++ b/test/integration/targets/consul/tasks/main.yml @@ -74,8 +74,6 @@ - vars: remote_dir: '{{ echo_output_dir.stdout }}' block: - # output_dir is hardcoded/created in test/runner/lib/executor.py and - # contains '~': expand remote path - command: 'echo {{ output_dir }}' register: echo_output_dir diff --git a/test/integration/targets/copy/tasks/main.yml b/test/integration/targets/copy/tasks/main.yml index a9d58e0962a..1ab4087d96b 100644 --- a/test/integration/targets/copy/tasks/main.yml +++ b/test/integration/targets/copy/tasks/main.yml @@ -7,7 +7,6 @@ - set_fact: local_temp_dir: '{{ tempfile_result.stdout }}' - # output_dir is hardcoded in test/runner/lib/executor.py and created there remote_dir: '{{ output_dir }}' symlinks: ansible-test-abs-link: /tmp/ansible-test-abs-link diff --git a/test/integration/targets/supervisorctl/tasks/main.yml b/test/integration/targets/supervisorctl/tasks/main.yml index b93b1ccbb95..38846b1c9fa 100644 --- a/test/integration/targets/supervisorctl/tasks/main.yml +++ b/test/integration/targets/supervisorctl/tasks/main.yml @@ -1,6 +1,4 @@ - block: - # output_dir is hardcoded in test/runner/lib/executor.py and created there - # expand remote path - command: 'echo {{ output_dir }}' register: echo - set_fact: diff --git a/test/units/module_utils/facts/other/test_facter.py b/test/units/module_utils/facts/other/test_facter.py index b18fa1135f3..86e906b58ca 100644 --- a/test/units/module_utils/facts/other/test_facter.py +++ b/test/units/module_utils/facts/other/test_facter.py @@ -30,7 +30,7 @@ facter_json_output = ''' "operatingsystemmajrelease": "25", "hardwareisa": "x86_64", "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", "memoryfree": "4.88 GB", "swapsize": "7.70 GB",