Imported Debian patch 4.0.5-6~numeezy

ipatests/test_xmlrpc/test_hbactest_plugin.py

@@ -21,20 +21,17 @@
 Test the `ipalib/plugins/hbactest.py` module.
 """
 
-from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
+from xmlrpc_test import XMLRPC_test, assert_attr_equal
 from ipalib import api
 from ipalib import errors
+from types import NoneType
 from nose.tools import raises
-import pytest
 
 # Test strategy:
 # 1. Create few allow rules: with user categories, with explicit users, with user groups, with groups, with services
 # 2. Create users for test
 # 3. Run detailed and non-detailed tests for explicitly specified rules, check expected result
 #
-
-
-@pytest.mark.tier1
 class test_hbactest(XMLRPC_test):
     """
     Test the `hbactest` plugin.
@@ -117,7 +114,7 @@ class test_hbactest(XMLRPC_test):
             rules=self.rule_names
         )
         assert ret['value'] == True
-        assert ret['error'] is None
+        assert type(ret['error']) == NoneType
         for i in [0,1,2,3]:
             assert self.rule_names[i] in ret['matched']