Module: check_mk
Branch: master
Commit: 746d6b71728af1c60d344086c4abc3b91ea1e876
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=746d6b71728af1…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Apr 1 17:27:45 2016 +0200
Cleaned up subclassing of GUITester
---
web/htdocs/guitester.py | 47 ++++++++++++++++++++++++++++++++++++++---
web/htdocs/html_mod_python.py | 5 -----
2 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/web/htdocs/guitester.py b/web/htdocs/guitester.py
index 3be4f73..6929273 100644
--- a/web/htdocs/guitester.py
+++ b/web/htdocs/guitester.py
@@ -41,6 +41,10 @@ class MKGuitestFailed(MKException):
class GUITester:
def __init__(self):
+ # Are overridden later by html()
+ self.user = None
+ self.start_time = None
+
self.guitest = None
self.replayed_guitest_step = None
self.guitest_repair_step = None
@@ -104,6 +108,11 @@ class GUITester:
raise MKGeneralException(_("Cannot load GUI test file %s: %s") %
(self.attrencode(path), e))
+ def guitest_fake_login(self, user_id):
+ config.login(user_id)
+ self.user = user_id
+
+
def replay_guitest(self):
test_name = self.var("test")
if not test_name:
@@ -186,16 +195,48 @@ class GUITester:
return guitest_check_element_list
+ #
+ # Abstract methods, are in html() object
+ #
+
+ def add_status_icon(self, img, tooltip, url = None):
+ raise NotImplementedError()
+
+
+ def attrencode(self, value):
+ raise NotImplementedError()
+
+
+ def var(self, varname, deflt = None):
+ raise NotImplementedError()
+
+
+ def get_transid(self):
+ raise NotImplementedError()
+
+
+ def store_new_transids(self):
+ raise NotImplementedError()
+
+
+ def write(self, text):
+ raise NotImplementedError()
+
+
+
def guitest_check_single_value(reference, reality):
+ errors = []
+
if len(reference) > 1:
errors.append("More than one reference value: %s" % ",
".join(reference))
if len(reality) > 1:
errors.append("More than one value: %s" % ",
".join(reality))
+
diff_text = guitest_check_text(reference[0], reality[0])
if diff_text:
- return [ diff_text ]
- else:
- return []
+ errors.append(diff_text)
+
+ return errors
def guitest_check_element_list_with_exceeding(reference, reality):
diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py
index 4c49a25..715126e 100644
--- a/web/htdocs/html_mod_python.py
+++ b/web/htdocs/html_mod_python.py
@@ -93,11 +93,6 @@ class html_mod_python(htmllib.html):
return self.req.headers_in.get('Referer', '')
- def guitest_fake_login(self, user_id):
- config.login(user_id)
- self.user = user_id
-
-
def verify_not_using_threaded_mpm(self):
if apache.mpm_query(apache.AP_MPMQ_IS_THREADED) != 0:
raise MKGeneralException(