diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2018-02-15 09:01:02 -0800 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2018-02-15 09:01:33 -0800 |
| commit | a7a03bbf4a7e4d76e2665eade8170fc70c927ab7 (patch) | |
| tree | 0a7ed0be38ff6d04e0ea0b9395dd6436a313031a /test | |
| parent | 4848652c7a760a530a8349ceb0d6ce95c8ad9586 (diff) | |
| download | ansible-a7a03bbf4a7e4d76e2665eade8170fc70c927ab7.tar.gz | |
Normalize usage of temp and tmp on tmp (#36221)
* Normalize usage of temp and tmp on tmp
* Rename system_tmps system_tmpdirs
* Add ANSIBLE_REMOTE_TMP spelling of environment variables
(cherry picked from commit 06f73ad578d840c7ea5875b7cd4ffd08e2d9d0e8)
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/targets/async_fail/action_plugins/normal.py | 2 | ||||
| -rw-r--r-- | test/units/plugins/action/test_action.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/targets/async_fail/action_plugins/normal.py b/test/integration/targets/async_fail/action_plugins/normal.py index 2429eeb329..297cbd9b9b 100644 --- a/test/integration/targets/async_fail/action_plugins/normal.py +++ b/test/integration/targets/async_fail/action_plugins/normal.py @@ -57,6 +57,6 @@ class ActionModule(ActionBase): if not wrap_async: # remove a temporary path we created - self._remove_tmp_path(self._connection._shell.tempdir) + self._remove_tmp_path(self._connection._shell.tmpdir) return result diff --git a/test/units/plugins/action/test_action.py b/test/units/plugins/action/test_action.py index 1c9ad74ae1..52fa3bea1b 100644 --- a/test/units/plugins/action/test_action.py +++ b/test/units/plugins/action/test_action.py @@ -235,7 +235,7 @@ class TestActionBase(unittest.TestCase): ret = None if opt == 'admin_users': ret = ['root', 'toor', 'Administrator'] - elif opt == 'remote_temp': + elif opt == 'remote_tmp': ret = '~/.ansible/tmp' return ret @@ -419,7 +419,7 @@ class TestActionBase(unittest.TestCase): mock_connection.socket_path = None mock_connection._shell.get_remote_filename.return_value = 'copy.py' mock_connection._shell.join_path.side_effect = os.path.join - mock_connection._shell.tempdir = '/var/tmp/mytempdir' + mock_connection._shell.tmpdir = '/var/tmp/mytempdir' # we're using a real play context here play_context = PlayContext() |