Skip to content

Commit

Permalink
Remove PYTHONPATH assertions no longer relevant
Browse files Browse the repository at this point in the history
  • Loading branch information
AlanCoding committed Jan 13, 2022
1 parent c2ffb1b commit 261d93e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
9 changes: 0 additions & 9 deletions test/unit/config/test__base.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ def test_prepare_env_defaults():

def test_prepare_env_ansible_vars(mocker, tmp_path):
mocker.patch.dict('os.environ', {
'PYTHONPATH': '/python_path_via_environ',
'AWX_LIB_DIRECTORY': '/awx_lib_directory_via_environ',
})

Expand All @@ -195,14 +194,6 @@ def test_prepare_env_ansible_vars(mocker, tmp_path):
assert rc.env['ANSIBLE_RETRY_FILES_ENABLED'] == 'False'
assert rc.env['ANSIBLE_HOST_KEY_CHECKING'] == 'False'
assert rc.env['AWX_ISOLATED_DATA_DIR'] == artifact_dir.joinpath(rc.ident).as_posix()
assert rc.env['PYTHONPATH'] == '/python_path_via_environ:/awx_lib_directory_via_environ', \
"PYTHONPATH is the union of the env PYTHONPATH and AWX_LIB_DIRECTORY"

del rc.env['PYTHONPATH']
os.environ['PYTHONPATH'] = "/foo/bar/python_path_via_environ"
rc._prepare_env()
assert rc.env['PYTHONPATH'] == "/foo/bar/python_path_via_environ:/awx_lib_directory_via_environ", \
"PYTHONPATH is the union of the explicit env['PYTHONPATH'] override and AWX_LIB_DIRECTORY"


def test_prepare_with_ssh_key(mocker, tmp_path):
Expand Down
9 changes: 0 additions & 9 deletions test/unit/config/test_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ def test_prepare_with_defaults(mocker):

def test_prepare(mocker):
mocker.patch.dict('os.environ', {
'PYTHONPATH': '/python_path_via_environ',
'AWX_LIB_DIRECTORY': '/awx_lib_directory_via_environ',
})
mocker.patch('os.makedirs', return_value=True)
Expand All @@ -431,14 +430,6 @@ def test_prepare(mocker):
assert rc.env['ANSIBLE_RETRY_FILES_ENABLED'] == 'False'
assert rc.env['ANSIBLE_HOST_KEY_CHECKING'] == 'False'
assert rc.env['AWX_ISOLATED_DATA_DIR'] == '/'
assert rc.env['PYTHONPATH'] == '/python_path_via_environ:/awx_lib_directory_via_environ', \
"PYTHONPATH is the union of the env PYTHONPATH and AWX_LIB_DIRECTORY"

del rc.env['PYTHONPATH']
os.environ['PYTHONPATH'] = "/foo/bar/python_path_via_environ"
rc.prepare()
assert rc.env['PYTHONPATH'] == "/foo/bar/python_path_via_environ:/awx_lib_directory_via_environ", \
"PYTHONPATH is the union of the explicit env['PYTHONPATH'] override and AWX_LIB_DIRECTORY"


def test_prepare_with_ssh_key(mocker):
Expand Down

0 comments on commit 261d93e

Please sign in to comment.