Module: check_mk
Branch: master
Commit: d0ce8b68ebbbfbf6a99ac1fedc84bed1890839b9
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0ce8b68ebbbfb…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Dec 21 16:39:14 2016 +0100
Tests: Now do not use the system apache at all; For testing the proxy setup we should
create dedicated tests
Change-Id: I58a6d93db10ad9d02ce6a7d2bce813e4b3f8ae89
---
tests/testlib/__init__.py | 8 ++------
tests/web/test_crawl.py | 1 -
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py
index d213fea..17ce733 100644
--- a/tests/testlib/__init__.py
+++ b/tests/testlib/__init__.py
@@ -434,14 +434,10 @@ class Site(object):
class WebSession(requests.Session):
def __init__(self):
self.transids = []
- # Resources are
+ # Resources are only fetched and verified once per session
self.verified_resources = set()
- self.via_system_apache = True
- super(WebSession, self).__init__()
-
-
- def dont_use_system_apache(self):
self.via_system_apache = False
+ super(WebSession, self).__init__()
def check_redirect(self, path, proto="http", expected_code=302,
expected_target=None):
diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py
index 6c10fd6..9fc2aa3 100644
--- a/tests/web/test_crawl.py
+++ b/tests/web/test_crawl.py
@@ -57,7 +57,6 @@ class Worker(threading.Thread):
self.idle = True
self.client = CMKWebSession(self.crawler.site)
- self.client.dont_use_system_apache()
self.client.login()
self.client.set_language("en")