Re: [Freeipa-devel] [PATCH] 0523 Fix expected output in permission tests

2014-04-15 Thread Martin Kosek
On 04/14/2014 09:41 PM, Petr Viktorin wrote:
 It turns out the test failure caused by the realmdomains ACI was not a single
 occurrence. Another one was caused by Read Group Password Policy.
 

/me sighs.

This fixes the tests, ACK.

Pushed to master: 3deb76cf17a79a0736aa555f550415e6d9f2ed08

Martin

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel


[Freeipa-devel] [PATCH] 0523 Fix expected output in permission tests

2014-04-14 Thread Petr Viktorin
It turns out the test failure caused by the realmdomains ACI was not a 
single occurrence. Another one was caused by Read Group Password Policy.


--
PetrĀ³
From 4eb4c1fe3a0fe22dd15b1f9c7ed10aa3d8098cb4 Mon Sep 17 00:00:00 2001
From: Petr Viktorin pvikt...@redhat.com
Date: Mon, 14 Apr 2014 20:51:29 +0200
Subject: [PATCH] Fix expected output in permission tests

There is now a second permission affecting krbMinPwdLife.
Add it to expected output.

---
 ipatests/test_xmlrpc/test_old_permission_plugin.py | 9 +++--
 ipatests/test_xmlrpc/test_permission_plugin.py | 9 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ipatests/test_xmlrpc/test_old_permission_plugin.py b/ipatests/test_xmlrpc/test_old_permission_plugin.py
index 56dd4435c2996114100334873d72f99201ec841a..c9f7e885778240320497c5ce8146f2d17c7ce4c5 100644
--- a/ipatests/test_xmlrpc/test_old_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_old_permission_plugin.py
@@ -461,15 +461,20 @@ class test_old_permission(Declarative):
 command=('permission_find', [], {'pkey_only': True,
  'attrs': [u'krbminpwdlife']}),
 expected=dict(
-count=1,
+count=2,
 truncated=False,
-summary=u'1 permission matched',
+summary=u'2 permissions matched',
 result=[
 {
 'dn': DN(('cn','Modify Group Password Policy'),
  api.env.container_permission, api.env.basedn),
 'cn': [u'Modify Group Password Policy'],
 },
+{
+'dn': DN(('cn', 'System: Read Group Password Policy'),
+ api.env.container_permission, api.env.basedn),
+'cn': [u'System: Read Group Password Policy'],
+},
 ],
 ),
 ),
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index 105f713f5e953821685baa9caba279e7e3940944..d593dd98670334d2ef696f4b632d00943c9862d6 100644
--- a/ipatests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -752,15 +752,20 @@ class test_permission(Declarative):
 command=('permission_find', [], {'pkey_only': True,
  'attrs': [u'krbminpwdlife']}),
 expected=dict(
-count=1,
+count=2,
 truncated=False,
-summary=u'1 permission matched',
+summary=u'2 permissions matched',
 result=[
 {
 'dn': DN(('cn','Modify Group Password Policy'),
  api.env.container_permission, api.env.basedn),
 'cn': [u'Modify Group Password Policy'],
 },
+{
+'dn': DN(('cn', 'System: Read Group Password Policy'),
+ api.env.container_permission, api.env.basedn),
+'cn': [u'System: Read Group Password Policy'],
+},
 ],
 ),
 ),
-- 
1.9.0

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel