Imported Debian patch 4.0.5-6~numeezy

ipatests/test_xmlrpc/test_pwpolicy_plugin.py

@@ -29,10 +29,8 @@ from ipapython.dn import DN
 from ipatests.test_xmlrpc import objectclasses
 from ipatests.test_xmlrpc.xmlrpc_test import (XMLRPC_test, assert_attr_equal,
                                               Declarative)
-import pytest
 
 
-@pytest.mark.tier1
 class test_pwpolicy(XMLRPC_test):
     """
     Test the `pwpolicy` plugin.
@@ -197,7 +195,7 @@ class test_pwpolicy(XMLRPC_test):
         # Test that returned values match the arguments
         # Only test the second and third results; the first one was modified
         for entry, expected in (result[1], self.kw2), (result[2], self.kw3):
-            for name, value in expected.items():
+            for name, value in expected.iteritems():
                 assert_attr_equal(entry, name, str(value))
 
     def test_c_pwpolicy_find_pkey_only(self):
@@ -248,7 +246,6 @@ class test_pwpolicy(XMLRPC_test):
         api.Command['user_del'](self.user)
 
 
-@pytest.mark.tier1
 class test_pwpolicy_mod_cospriority(Declarative):
     """Tests for cospriority modifications"""
     cleanup_commands = [