Fix failing test due to mokey patching

An earlier test monkey-patched the permission checks which subsequently
failed in another test.

Author: schlatterbeck

test/test_cgi.py

@@ -1035,9 +1035,11 @@ def load_template(x):
         def hasPermission(s, p, classname=None, d=None, e=None, **kw):
             return True
         actions.Action.hasPermission = hasPermission
+        orig_HTMLItem_is_edit_ok = _HTMLItem.is_edit_ok
         e1 = _HTMLItem.is_edit_ok
         _HTMLItem.is_edit_ok = lambda x : True
         e2 = HTMLProperty.is_edit_ok
+        orig_HTMLProperty_is_edit_ok = HTMLProperty.is_edit_ok
         HTMLProperty.is_edit_ok = lambda x : True
 
         # test with no headers. Default config requires that 1 header
@@ -1227,6 +1229,9 @@ def hasPermission(s, p, classname=None, d=None, e=None, **kw):
         if os.path.exists(SENDMAILDEBUG):
             os.remove(SENDMAILDEBUG)
         #raise ValueError
+        # Undo monkey patching
+        _HTMLItem.is_edit_ok = orig_HTMLItem_is_edit_ok
+        HTMLProperty.is_edit_ok = orig_HTMLProperty_is_edit_ok
 
     def testRestOriginValidationCredentials(self):
         import json

test/test_liveserver.py

@@ -1292,7 +1292,6 @@ def test__generic_item_template_editok(self, user="admin"):
         f = session.get(self.url_base()+'/?@action=logout')
         self.assertIn(b"Remember me?", f.content)
 
-    @pytest.mark.xfail
     def test__generic_item_template_editbad(self, user="fred"):
         self.test__generic_item_template_editok(user=user)