diff options
| author | Sam Doran <sdoran@redhat.com> | 2019-04-03 22:35:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-03 22:35:59 -0400 |
| commit | 6ce9cf7741679449fc3ac6347bd7209ae697cc5b (patch) | |
| tree | eb02f5923e549309e05cd2d5a751467d49db347a /test/integration/targets/assert | |
| parent | 9776037abe7df5718e5d45182d78cde9dbfd6678 (diff) | |
| download | ansible-6ce9cf7741679449fc3ac6347bd7209ae697cc5b.tar.gz | |
Change default smart connection to ssh on macOS and remove paramiko from requirements.txt (#54738)
* Remove default use of paramiko connection plugin on macOS
This fix was originally to work around a bug that caused a kernel panic on macOS
that has since been fixed.
* Remove paramiko from requirements.txt
* Move paramiko checking to common place
* Drop the warnings obfiscation code
* Update pip installation instructions to reflect upstream instructions
* Fix tests on CentOS 6 (Python 2.6) that now show Python deprecation warnings
* Add changelog fragment
Diffstat (limited to 'test/integration/targets/assert')
| -rwxr-xr-x | test/integration/targets/assert/runme.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/integration/targets/assert/runme.sh b/test/integration/targets/assert/runme.sh index 45ef3aafb5..ca0a858726 100755 --- a/test/integration/targets/assert/runme.sh +++ b/test/integration/targets/assert/runme.sh @@ -25,6 +25,9 @@ run_test() { sed -i -e 's/ *$//' "${OUTFILE}.${testname}.stdout" sed -i -e 's/ *$//' "${OUTFILE}.${testname}.stderr" + # Scrub deprication warning that shows up in Python 2.6 on CentOS 6 + sed -i -e '/RandomPool_DeprecationWarning/d' "${OUTFILE}.${testname}.stderr" + diff -u "${ORIGFILE}.${testname}.stdout" "${OUTFILE}.${testname}.stdout" || diff_failure diff -u "${ORIGFILE}.${testname}.stderr" "${OUTFILE}.${testname}.stderr" || diff_failure } |