Replace old pwpolicy plugin with new one using baseldap, fix tests.

Fix deletion of policy when a group is removed.

1 files changed, 24 insertions, 30 deletions

diff --git a/tests/test_xmlrpc/test_pwpolicy.py b/tests/test_xmlrpc/test_pwpolicy.py
index 1a34c02ae..94063c568 100644
--- a/tests/test_xmlrpc/test_pwpolicy.py
+++ b/tests/test_xmlrpc/test_pwpolicy.py
@@ -1,7 +1,8 @@
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>
+#   Pavel Zuna <pzuna@redhat.com>
 #
-# Copyright (C) 2009  Red Hat
+# Copyright (C) 2010  Red Hat
 # see file 'COPYING' for use and warranty information
 #
 # This program is free software; you can redistribute it and/or
@@ -30,11 +31,11 @@ class test_pwpolicy(XMLRPC_test):
     """
     Test the `pwpolicy` plugin.
     """
-    group = u'testgroup1'
-    group2 = u'testgroup2'
-    user = u'testuser1'
-    kw = {'group': group, 'cospriority': 1, 'krbminpwdlife': 30, 'krbmaxpwdlife': 40, 'krbpwdhistorylength': 5, 'krbpwdminlength': 6 }
-    kw2 = {'group': group2, 'cospriority': 2, 'krbminpwdlife': 40, 'krbmaxpwdlife': 60, 'krbpwdhistorylength': 8, 'krbpwdminlength': 9 }
+    group = u'testgroup12'
+    group2 = u'testgroup22'
+    user = u'testuser12'
+    kw = {'cospriority': 1, 'krbminpwdlife': 30, 'krbmaxpwdlife': 40, 'krbpwdhistorylength': 5, 'krbpwdminlength': 6 }
+    kw2 = {'cospriority': 2, 'krbminpwdlife': 40, 'krbmaxpwdlife': 60, 'krbpwdhistorylength': 8, 'krbpwdminlength': 9 }
 
     def test_1_pwpolicy_add(self):
         """
@@ -49,21 +50,22 @@ class test_pwpolicy(XMLRPC_test):
         )
         api.Command.group_add_member(self.group, users=self.user)
 
-        entry = api.Command['pwpolicy_add'](**self.kw)['result']
+        entry = api.Command['pwpolicy_add'](self.group, **self.kw)['result']
         assert_attr_equal(entry, 'krbminpwdlife', '30')
         assert_attr_equal(entry, 'krbmaxpwdlife', '40')
         assert_attr_equal(entry, 'krbpwdhistorylength', '5')
         assert_attr_equal(entry, 'krbpwdminlength', '6')
+        assert_attr_equal(entry, 'cospriority', '1')
 
     def test_2_pwpolicy_add(self):
         """
-        Add a policy with a duplicate priority
+        Add a policy with a already used priority.
 
-        The priority validation is done first so it's ok that the group
+        The priority validation is done first, so it's OK that the group
         is the same here.
         """
         try:
-            api.Command['pwpolicy_add'](**self.kw)
+            api.Command['pwpolicy_add'](self.group, **self.kw)
         except errors.ValidationError:
             pass
         else:
@@ -71,12 +73,12 @@ class test_pwpolicy(XMLRPC_test):
 
     def test_3_pwpolicy_add(self):
         """
-        Add a policy that already exists
+        Add a policy that already exists.
         """
         try:
             # cospriority needs to be unique
             self.kw['cospriority'] = 3
-            api.Command['pwpolicy_add'](**self.kw)
+            api.Command['pwpolicy_add'](self.group, **self.kw)
         except errors.DuplicateEntry:
             pass
         else:
@@ -89,18 +91,19 @@ class test_pwpolicy(XMLRPC_test):
         self.failsafe_add(
             api.Object.group, self.group2, description=u'pwpolicy test group 2'
         )
-        entry = api.Command['pwpolicy_add'](**self.kw2)['result']
+        entry = api.Command['pwpolicy_add'](self.group2, **self.kw2)['result']
         assert_attr_equal(entry, 'krbminpwdlife', '40')
         assert_attr_equal(entry, 'krbmaxpwdlife', '60')
         assert_attr_equal(entry, 'krbpwdhistorylength', '8')
         assert_attr_equal(entry, 'krbpwdminlength', '9')
+        assert_attr_equal(entry, 'cospriority', '2')
 
     def test_5_pwpolicy_add(self):
         """
         Add a pwpolicy for a non-existent group
         """
         try:
-            api.Command['pwpolicy_add'](group=u'nopwpolicy',cospriority=4,krbminpwdlife=1)
+            api.Command['pwpolicy_add'](u'nopwpolicy', cospriority=1, krbminpwdlife=1)
         except errors.NotFound:
             pass
         else:
@@ -121,11 +124,12 @@ class test_pwpolicy(XMLRPC_test):
         """
         Test the `xmlrpc.pwpolicy_show` method.
         """
-        entry = api.Command['pwpolicy_show'](group=self.group)['result']
+        entry = api.Command['pwpolicy_show'](self.group)['result']
         assert_attr_equal(entry, 'krbminpwdlife', '30')
         assert_attr_equal(entry, 'krbmaxpwdlife', '40')
         assert_attr_equal(entry, 'krbpwdhistorylength', '5')
         assert_attr_equal(entry, 'krbpwdminlength', '6')
+        assert_attr_equal(entry, 'cospriority', '1')
 
     def test_8_pwpolicy_mod(self):
         """
@@ -142,28 +146,17 @@ class test_pwpolicy(XMLRPC_test):
         """
         Test the `xmlrpc.pwpolicy_mod` method.
         """
-        entry = api.Command['pwpolicy_mod'](group=self.group, krbminpwdlife=50)['result']
+        entry = api.Command['pwpolicy_mod'](self.group, krbminpwdlife=50)['result']
         assert_attr_equal(entry, 'krbminpwdlife', '50')
 
-    def test_a_pwpolicy_mod(self):
-        """
-        Test `xmlrpc.pwpolicy_mod` with a duplicate priority
-        """
-        try:
-            api.Command['pwpolicy_mod'](group=self.group, cospriority=1)
-        except errors.ValidationError:
-            pass
-        else:
-            assert False
-
-    def test_b_pwpolicy_del(self):
+    def test_a_pwpolicy_del(self):
         """
         Test the `xmlrpc.pwpolicy_del` method.
         """
-        assert api.Command['pwpolicy_del'](group=self.group)['result'] is True
+        assert api.Command['pwpolicy_del'](self.group)['result'] is True
         # Verify that it is gone
         try:
-            api.Command['pwpolicy_show'](group=self.group)
+            api.Command['pwpolicy_show'](self.group)
         except errors.NotFound:
             pass
         else:
@@ -175,3 +168,4 @@ class test_pwpolicy(XMLRPC_test):
 
         # Remove the user we created
         api.Command['user_del'](self.user)
+