[checkmk-commits] Tests: Load cmk credentials only when needed

Module: check_mk Branch: master Commit: 505ba449b80f0154b28197a2458bcd37f1d6c976 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=505ba449b80f01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 10:54:19 2018 +0100 Tests: Load cmk credentials only when needed Change-Id: I43b81c8de71fabc05d213f7995ff05fc8660a5ec --- tests/testlib/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index ec8b382..d66da37 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -78,8 +78,6 @@ class CMKVersion(object): raise Exception("Invalid edition: %s. Must be short notation (cee, cre, ...)") self.edition_short = edition - self._credentials = self._get_cmk_download_credentials() - self.set_version(version, branch) @@ -181,7 +179,7 @@ class CMKVersion(object): def _version_available(self): - response = requests.head(self.package_url(), auth=self._credentials, verify=False) + response = requests.head(self.package_url(), auth=self._get_cmk_download_credentials(), verify=False) available_on_server = response.status_code == 200 return self.is_installed() or available_on_server @@ -190,7 +188,7 @@ class CMKVersion(object): temp_package_path = "/tmp/%s" % self.package_name() print(self.package_url()) - response = requests.get(self.package_url(), auth=self._credentials, verify=False) + response = requests.get(self.package_url(), auth=self._get_cmk_download_credentials(), verify=False) if response.status_code != 200: raise Exception("Failed to load package: %s" % self.package_url()) file(temp_package_path, "w").write(response.content)