diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-18 07:30:26 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-18 07:30:26 -0800 |
commit | 44f9ab2767cd7390c53b5a4bc0bf424094ae5956 (patch) | |
tree | e5e6f2b3ecea1c43093e0f01d5f4634dfe3c7a44 /roles/openshift_health_checker/test/kibana_test.py | |
parent | 6a26d0c0799cf5915c61205450e18ff010485beb (diff) | |
parent | 1492b3b0cc7556e7d68b127d55dc0f36a947925a (diff) | |
download | openshift-44f9ab2767cd7390c53b5a4bc0bf424094ae5956.tar.gz openshift-44f9ab2767cd7390c53b5a4bc0bf424094ae5956.tar.bz2 openshift-44f9ab2767cd7390c53b5a4bc0bf424094ae5956.tar.xz openshift-44f9ab2767cd7390c53b5a4bc0bf424094ae5956.zip |
Merge pull request #6589 from vrutkovs/kibana-use-six
Automatic merge from submit-queue.
kibana checks: use six.moves instead of ImportError
Diffstat (limited to 'roles/openshift_health_checker/test/kibana_test.py')
-rw-r--r-- | roles/openshift_health_checker/test/kibana_test.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/roles/openshift_health_checker/test/kibana_test.py b/roles/openshift_health_checker/test/kibana_test.py index 04a5e89c4..750d4b9e9 100644 --- a/roles/openshift_health_checker/test/kibana_test.py +++ b/roles/openshift_health_checker/test/kibana_test.py @@ -1,12 +1,10 @@ import pytest import json -try: - import urllib2 - from urllib2 import HTTPError, URLError -except ImportError: - from urllib.error import HTTPError, URLError - import urllib.request as urllib2 +# pylint can't find the package when its installed in virtualenv +from ansible.module_utils.six.moves.urllib import request # pylint: disable=import-error +# pylint: disable=import-error +from ansible.module_utils.six.moves.urllib.error import HTTPError, URLError from openshift_checks.logging.kibana import Kibana, OpenShiftCheckException @@ -202,7 +200,7 @@ def test_verify_url_external_failure(lib_result, expect, monkeypatch): if type(lib_result) is int: return _http_return(lib_result) raise lib_result - monkeypatch.setattr(urllib2, 'urlopen', urlopen) + monkeypatch.setattr(request, 'urlopen', urlopen) check = Kibana() check._get_kibana_url = lambda: 'url' |