Re: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, create SudoCmdGroupTracker

2016-03-01 Thread Tomas Babej 


On 03/01/2016 01:29 PM, Aleš Mareček wrote:
> ACK.
> Thank you!
> 
> Master push: Make sure it will go *after or together with* the previous patch 
> from Filip, #0007, thanks!
> 
>  - alich -
> 
> - Original Message -
>> From: "Filip Skola" <fsk...@redhat.com>
>> To: "Aleš Mareček" <amare...@redhat.com>
>> Cc: freeipa-devel@redhat.com, "Milan Kubík" <mku...@redhat.com>
>> Sent: Wednesday, February 24, 2016 8:13:03 PM
>> Subject: Re: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, 
>> create SudoCmdGroupTracker
>>
>> Hi,
>>
>> fixed. To be honest, I left that +1char longer lines there on purpose. IMHO
>> it brings better readability and pep8 *.py | wc -l in test_xmlrpc dir
>> returns an overwhelming number anyway. But yeah, some of these weren't
>> really necessary...so I changed them all :)
>>
>> This patch is dependent on 0007-3 patch.
>>
>> Filip
>>
>> - Original Message -
>>> NACK.
>>>
>>>
>>> [root@master2 test_xmlrpc]# pep8 test_sudocmdgroup_plugin.py
>>> test_sudocmdgroup_plugin.py:26:80: E501 line too long (80 > 79 characters)
>>> test_sudocmdgroup_plugin.py:70:80: E501 line too long (80 > 79 characters)
>>> test_sudocmdgroup_plugin.py:76:80: E501 line too long (80 > 79 characters)
>>> test_sudocmdgroup_plugin.py:84:80: E501 line too long (80 > 79 characters)
>>> test_sudocmdgroup_plugin.py:90:80: E501 line too long (80 > 79 characters)
>>> test_sudocmdgroup_plugin.py:98:80: E501 line too long (80 > 79 characters)
>>> test_sudocmdgroup_plugin.py:104:80: E501 line too long (80 > 79 characters)
>>> test_sudocmdgroup_plugin.py:166:80: E501 line too long (80 > 79 characters)
>>> test_sudocmdgroup_plugin.py:180:80: E501 line too long (80 > 79 characters)
>>> test_sudocmdgroup_plugin.py:186:80: E501 line too long (84 > 79 characters)
>>> [root@master2 test_xmlrpc]# pep8 tracker/sudocmdgroup_plugin.py
>>> tracker/sudocmdgroup_plugin.py:36:80: E501 line too long (82 > 79
>>> characters)
>>> tracker/sudocmdgroup_plugin.py:42:80: E501 line too long (82 > 79
>>> characters)
>>> tracker/sudocmdgroup_plugin.py:46:80: E501 line too long (85 > 79
>>> characters)
>>> tracker/sudocmdgroup_plugin.py:55:80: E501 line too long (82 > 79
>>> characters)
>>> tracker/sudocmdgroup_plugin.py:64:80: E501 line too long (82 > 79
>>> characters)
>>>
>>>
>>>
>>> - Original Message -
>>>> From: "Filip Skola" <fsk...@redhat.com>
>>>> To: "Aleš Mareček" <amare...@redhat.com>
>>>> Cc: freeipa-devel@redhat.com, "Milan Kubík" <mku...@redhat.com>
>>>> Sent: Monday, February 22, 2016 3:41:36 PM
>>>> Subject: Re: [Freeipa-devel] [PATCH] 0008 Refactor
>>>> test_sudocmdgroup_plugin, create SudoCmdGroupTracker
>>>>
>>>> Hi,
>>>>
>>>> the test has been updated so it now uses the SudoCmdTracker (from the
>>>> previous patch).
>>>>
>>>> Filip
>>>>
>>>> - Original Message -
>>>>> NACK.
>>>>>
>>>>> "create_sudocmd" and "delete_sudocmd" should be imported from Tracker,
>>>>> not
>>>>> from the previous test (sudocmd_plugin).
>>>>>
>>>>>   - alich -
>>>>>
>>>>> - Original Message -
>>>>>> From: "Filip Skola" <fsk...@redhat.com>
>>>>>> To: freeipa-devel@redhat.com
>>>>>> Sent: Thursday, January 28, 2016 12:49:17 PM
>>>>>> Subject: [Freeipa-devel] [PATCH] 0008 Refactor
>>>>>> test_sudocmdgroup_plugin,
>>>>>> create SudoCmdGroupTracker
>>>>>>
>>>>>> Hi,
>>>>>>
>>>>>> sending the next sudo patch. This one depends on the previous one
>>>>>> (sudocmd_plugin).
>>>>>>
>>>>>> Filip
>>>>>>
>>>>>> --
>>>>>> Manage your subscription for the Freeipa-devel mailing list:
>>>>>> https://www.redhat.com/mailman/listinfo/freeipa-devel
>>>>>> Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
>>>>>
>>>>
>>>
>>
> 

Pushed to master: dd38602fa5ea3f0a51db5458e846f3756ab74e47

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, create SudoCmdGroupTracker

2016-03-01 Thread Aleš Mareček 
ACK.
Thank you!

Master push: Make sure it will go *after or together with* the previous patch 
from Filip, #0007, thanks!

 - alich -

- Original Message -
> From: "Filip Skola" <fsk...@redhat.com>
> To: "Aleš Mareček" <amare...@redhat.com>
> Cc: freeipa-devel@redhat.com, "Milan Kubík" <mku...@redhat.com>
> Sent: Wednesday, February 24, 2016 8:13:03 PM
> Subject: Re: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, 
> create SudoCmdGroupTracker
> 
> Hi,
> 
> fixed. To be honest, I left that +1char longer lines there on purpose. IMHO
> it brings better readability and pep8 *.py | wc -l in test_xmlrpc dir
> returns an overwhelming number anyway. But yeah, some of these weren't
> really necessary...so I changed them all :)
> 
> This patch is dependent on 0007-3 patch.
> 
> Filip
> 
> - Original Message -
> > NACK.
> > 
> > 
> > [root@master2 test_xmlrpc]# pep8 test_sudocmdgroup_plugin.py
> > test_sudocmdgroup_plugin.py:26:80: E501 line too long (80 > 79 characters)
> > test_sudocmdgroup_plugin.py:70:80: E501 line too long (80 > 79 characters)
> > test_sudocmdgroup_plugin.py:76:80: E501 line too long (80 > 79 characters)
> > test_sudocmdgroup_plugin.py:84:80: E501 line too long (80 > 79 characters)
> > test_sudocmdgroup_plugin.py:90:80: E501 line too long (80 > 79 characters)
> > test_sudocmdgroup_plugin.py:98:80: E501 line too long (80 > 79 characters)
> > test_sudocmdgroup_plugin.py:104:80: E501 line too long (80 > 79 characters)
> > test_sudocmdgroup_plugin.py:166:80: E501 line too long (80 > 79 characters)
> > test_sudocmdgroup_plugin.py:180:80: E501 line too long (80 > 79 characters)
> > test_sudocmdgroup_plugin.py:186:80: E501 line too long (84 > 79 characters)
> > [root@master2 test_xmlrpc]# pep8 tracker/sudocmdgroup_plugin.py
> > tracker/sudocmdgroup_plugin.py:36:80: E501 line too long (82 > 79
> > characters)
> > tracker/sudocmdgroup_plugin.py:42:80: E501 line too long (82 > 79
> > characters)
> > tracker/sudocmdgroup_plugin.py:46:80: E501 line too long (85 > 79
> > characters)
> > tracker/sudocmdgroup_plugin.py:55:80: E501 line too long (82 > 79
> > characters)
> > tracker/sudocmdgroup_plugin.py:64:80: E501 line too long (82 > 79
> > characters)
> > 
> > 
> > 
> > - Original Message -
> > > From: "Filip Skola" <fsk...@redhat.com>
> > > To: "Aleš Mareček" <amare...@redhat.com>
> > > Cc: freeipa-devel@redhat.com, "Milan Kubík" <mku...@redhat.com>
> > > Sent: Monday, February 22, 2016 3:41:36 PM
> > > Subject: Re: [Freeipa-devel] [PATCH] 0008 Refactor
> > > test_sudocmdgroup_plugin, create SudoCmdGroupTracker
> > > 
> > > Hi,
> > > 
> > > the test has been updated so it now uses the SudoCmdTracker (from the
> > > previous patch).
> > > 
> > > Filip
> > > 
> > > - Original Message -
> > > > NACK.
> > > > 
> > > > "create_sudocmd" and "delete_sudocmd" should be imported from Tracker,
> > > > not
> > > > from the previous test (sudocmd_plugin).
> > > > 
> > > >   - alich -
> > > > 
> > > > - Original Message -
> > > > > From: "Filip Skola" <fsk...@redhat.com>
> > > > > To: freeipa-devel@redhat.com
> > > > > Sent: Thursday, January 28, 2016 12:49:17 PM
> > > > > Subject: [Freeipa-devel] [PATCH] 0008 Refactor
> > > > > test_sudocmdgroup_plugin,
> > > > > create SudoCmdGroupTracker
> > > > > 
> > > > > Hi,
> > > > > 
> > > > > sending the next sudo patch. This one depends on the previous one
> > > > > (sudocmd_plugin).
> > > > > 
> > > > > Filip
> > > > > 
> > > > > --
> > > > > Manage your subscription for the Freeipa-devel mailing list:
> > > > > https://www.redhat.com/mailman/listinfo/freeipa-devel
> > > > > Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
> > > > 
> > > 
> > 
> 

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, create SudoCmdGroupTracker

2016-02-24 Thread Filip Skola 
Hi,

fixed. To be honest, I left that +1char longer lines there on purpose. IMHO it 
brings better readability and pep8 *.py | wc -l in test_xmlrpc dir returns an 
overwhelming number anyway. But yeah, some of these weren't really 
necessary...so I changed them all :)

This patch is dependent on 0007-3 patch.

Filip

- Original Message -
> NACK.
> 
> 
> [root@master2 test_xmlrpc]# pep8 test_sudocmdgroup_plugin.py
> test_sudocmdgroup_plugin.py:26:80: E501 line too long (80 > 79 characters)
> test_sudocmdgroup_plugin.py:70:80: E501 line too long (80 > 79 characters)
> test_sudocmdgroup_plugin.py:76:80: E501 line too long (80 > 79 characters)
> test_sudocmdgroup_plugin.py:84:80: E501 line too long (80 > 79 characters)
> test_sudocmdgroup_plugin.py:90:80: E501 line too long (80 > 79 characters)
> test_sudocmdgroup_plugin.py:98:80: E501 line too long (80 > 79 characters)
> test_sudocmdgroup_plugin.py:104:80: E501 line too long (80 > 79 characters)
> test_sudocmdgroup_plugin.py:166:80: E501 line too long (80 > 79 characters)
> test_sudocmdgroup_plugin.py:180:80: E501 line too long (80 > 79 characters)
> test_sudocmdgroup_plugin.py:186:80: E501 line too long (84 > 79 characters)
> [root@master2 test_xmlrpc]# pep8 tracker/sudocmdgroup_plugin.py
> tracker/sudocmdgroup_plugin.py:36:80: E501 line too long (82 > 79 characters)
> tracker/sudocmdgroup_plugin.py:42:80: E501 line too long (82 > 79 characters)
> tracker/sudocmdgroup_plugin.py:46:80: E501 line too long (85 > 79 characters)
> tracker/sudocmdgroup_plugin.py:55:80: E501 line too long (82 > 79 characters)
> tracker/sudocmdgroup_plugin.py:64:80: E501 line too long (82 > 79 characters)
> 
> 
> 
> - Original Message -
> > From: "Filip Skola" <fsk...@redhat.com>
> > To: "Aleš Mareček" <amare...@redhat.com>
> > Cc: freeipa-devel@redhat.com, "Milan Kubík" <mku...@redhat.com>
> > Sent: Monday, February 22, 2016 3:41:36 PM
> > Subject: Re: [Freeipa-devel] [PATCH] 0008 Refactor
> > test_sudocmdgroup_plugin, create SudoCmdGroupTracker
> > 
> > Hi,
> > 
> > the test has been updated so it now uses the SudoCmdTracker (from the
> > previous patch).
> > 
> > Filip
> > 
> > - Original Message -
> > > NACK.
> > > 
> > > "create_sudocmd" and "delete_sudocmd" should be imported from Tracker,
> > > not
> > > from the previous test (sudocmd_plugin).
> > > 
> > >   - alich -
> > > 
> > > - Original Message -
> > > > From: "Filip Skola" <fsk...@redhat.com>
> > > > To: freeipa-devel@redhat.com
> > > > Sent: Thursday, January 28, 2016 12:49:17 PM
> > > > Subject: [Freeipa-devel] [PATCH] 0008 Refactor
> > > > test_sudocmdgroup_plugin,
> > > > create SudoCmdGroupTracker
> > > > 
> > > > Hi,
> > > > 
> > > > sending the next sudo patch. This one depends on the previous one
> > > > (sudocmd_plugin).
> > > > 
> > > > Filip
> > > > 
> > > > --
> > > > Manage your subscription for the Freeipa-devel mailing list:
> > > > https://www.redhat.com/mailman/listinfo/freeipa-devel
> > > > Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
> > > 
> > 
> 
From 0fe52e2a9718a0aae5542e8bedc8d312dbc6e360 Mon Sep 17 00:00:00 2001
From: Filip Skola <fsk...@redhat.com>
Date: Mon, 22 Feb 2016 14:21:56 +0100
Subject: [PATCH] Refactor test_sudocmdgroup_plugin

---
 ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py   | 860 +
 .../test_xmlrpc/tracker/sudocmdgroup_plugin.py | 226 ++
 2 files changed, 415 insertions(+), 671 deletions(-)
 create mode 100644 ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py

diff --git a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
index c72ba2f7a25d5b3c4817c7e17346a8ff5a324760..3f5879c4d90ed9872b9287344583892405bebff3 100644
--- a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
@@ -20,678 +20,196 @@
 Test the `ipalib/plugins/sudocmdgroup.py` module.
 """
 
-from ipalib import api, errors
-from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
-  fuzzy_sudocmddn)
-from ipapython.dn import DN
-import pytest
-
-sudocmdgroup1 = u'testsudocmdgroup1'
-sudocmdgroup2 = u'testsudocmdgroup2'
-sudocmd1 = u'/usr/bin/sudotestcmd1'
-sudocmd1_camelcase = u'/u

Re: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, create SudoCmdGroupTracker

2016-02-23 Thread Aleš Mareček 
NACK.


[root@master2 test_xmlrpc]# pep8 test_sudocmdgroup_plugin.py 
test_sudocmdgroup_plugin.py:26:80: E501 line too long (80 > 79 characters)
test_sudocmdgroup_plugin.py:70:80: E501 line too long (80 > 79 characters)
test_sudocmdgroup_plugin.py:76:80: E501 line too long (80 > 79 characters)
test_sudocmdgroup_plugin.py:84:80: E501 line too long (80 > 79 characters)
test_sudocmdgroup_plugin.py:90:80: E501 line too long (80 > 79 characters)
test_sudocmdgroup_plugin.py:98:80: E501 line too long (80 > 79 characters)
test_sudocmdgroup_plugin.py:104:80: E501 line too long (80 > 79 characters)
test_sudocmdgroup_plugin.py:166:80: E501 line too long (80 > 79 characters)
test_sudocmdgroup_plugin.py:180:80: E501 line too long (80 > 79 characters)
test_sudocmdgroup_plugin.py:186:80: E501 line too long (84 > 79 characters)
[root@master2 test_xmlrpc]# pep8 tracker/sudocmdgroup_plugin.py
tracker/sudocmdgroup_plugin.py:36:80: E501 line too long (82 > 79 characters)
tracker/sudocmdgroup_plugin.py:42:80: E501 line too long (82 > 79 characters)
tracker/sudocmdgroup_plugin.py:46:80: E501 line too long (85 > 79 characters)
tracker/sudocmdgroup_plugin.py:55:80: E501 line too long (82 > 79 characters)
tracker/sudocmdgroup_plugin.py:64:80: E501 line too long (82 > 79 characters)



- Original Message -
> From: "Filip Skola" <fsk...@redhat.com>
> To: "Aleš Mareček" <amare...@redhat.com>
> Cc: freeipa-devel@redhat.com, "Milan Kubík" <mku...@redhat.com>
> Sent: Monday, February 22, 2016 3:41:36 PM
> Subject: Re: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, 
> create SudoCmdGroupTracker
> 
> Hi,
> 
> the test has been updated so it now uses the SudoCmdTracker (from the
> previous patch).
> 
> Filip
> 
> - Original Message -
> > NACK.
> > 
> > "create_sudocmd" and "delete_sudocmd" should be imported from Tracker, not
> > from the previous test (sudocmd_plugin).
> > 
> >   - alich -
> > 
> > - Original Message -
> > > From: "Filip Skola" <fsk...@redhat.com>
> > > To: freeipa-devel@redhat.com
> > > Sent: Thursday, January 28, 2016 12:49:17 PM
> > > Subject: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin,
> > > create SudoCmdGroupTracker
> > > 
> > > Hi,
> > > 
> > > sending the next sudo patch. This one depends on the previous one
> > > (sudocmd_plugin).
> > > 
> > > Filip
> > > 
> > > --
> > > Manage your subscription for the Freeipa-devel mailing list:
> > > https://www.redhat.com/mailman/listinfo/freeipa-devel
> > > Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
> > 
> 

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, create SudoCmdGroupTracker

2016-02-22 Thread Filip Skola 
Hi,

the test has been updated so it now uses the SudoCmdTracker (from the previous 
patch).

Filip

- Original Message -
> NACK.
> 
> "create_sudocmd" and "delete_sudocmd" should be imported from Tracker, not
> from the previous test (sudocmd_plugin).
> 
>   - alich -
> 
> - Original Message -
> > From: "Filip Skola" <fsk...@redhat.com>
> > To: freeipa-devel@redhat.com
> > Sent: Thursday, January 28, 2016 12:49:17 PM
> > Subject: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin,
> > create SudoCmdGroupTracker
> > 
> > Hi,
> > 
> > sending the next sudo patch. This one depends on the previous one
> > (sudocmd_plugin).
> > 
> > Filip
> > 
> > --
> > Manage your subscription for the Freeipa-devel mailing list:
> > https://www.redhat.com/mailman/listinfo/freeipa-devel
> > Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
> 
From 023a89906d134b3141ac479e56ca64ccbda86801 Mon Sep 17 00:00:00 2001
From: Filip Skola <fsk...@redhat.com>
Date: Mon, 22 Feb 2016 14:21:56 +0100
Subject: [PATCH] Refactor test_sudocmdgroup_plugin

---
 ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py   | 849 +
 ipatests/test_xmlrpc/tracker/sudocmd_plugin.py |   2 +-
 .../test_xmlrpc/tracker/sudocmdgroup_plugin.py | 221 ++
 3 files changed, 401 insertions(+), 671 deletions(-)
 create mode 100644 ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py

diff --git a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
index c72ba2f7a25d5b3c4817c7e17346a8ff5a324760..dfeef98fa936f0ca0fd75d1e2f1986bc5844ebc1 100644
--- a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
@@ -20,678 +20,187 @@
 Test the `ipalib/plugins/sudocmdgroup.py` module.
 """
 
-from ipalib import api, errors
-from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
-  fuzzy_sudocmddn)
-from ipapython.dn import DN
+from ipalib import errors
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, raises_exact
+from ipatests.test_xmlrpc.tracker.sudocmd_plugin import SudoCmdTracker
+from ipatests.test_xmlrpc.tracker.sudocmdgroup_plugin import SudoCmdGroupTracker
 import pytest
 
-sudocmdgroup1 = u'testsudocmdgroup1'
-sudocmdgroup2 = u'testsudocmdgroup2'
-sudocmd1 = u'/usr/bin/sudotestcmd1'
-sudocmd1_camelcase = u'/usr/bin/sudoTestCmd1'
-sudocmd_plus = u'/bin/ls -l /lost+found/*'
-
-def create_command(sudocmd):
-return dict(
-desc='Create %r' % sudocmd,
-command=(
-'sudocmd_add', [], dict(sudocmd=sudocmd,
-description=u'Test sudo command')
-),
-expected=dict(
-value=sudocmd,
-summary=u'Added Sudo Command "%s"' % sudocmd,
-result=dict(
-objectclass=objectclasses.sudocmd,
-sudocmd=[sudocmd],
-ipauniqueid=[fuzzy_uuid], description=[u'Test sudo command'],
-dn=fuzzy_sudocmddn,
-),
-),
-)
+
+@pytest.fixture(scope='class')
+def sudocmd1(request):
+tracker = SudoCmdTracker(command=u'/usr/bin/sudotestcmd1',
+ description=u'Test sudo command 1')
+return tracker.make_fixture(request)
+
+
+@pytest.fixture(scope='class')
+def sudocmd2(request):
+tracker = SudoCmdTracker(command=u'/usr/bin/sudoTestCmd1',
+ description=u'Test sudo command 2')
+return tracker.make_fixture(request)
+
+
+@pytest.fixture(scope='class')
+def sudocmd_plus(request):
+tracker = SudoCmdTracker(command=u'/bin/ls -l /lost+found/*',
+ description=u'Test sudo command 3')
+return tracker.make_fixture(request)
+
+
+@pytest.fixture(scope='class')
+def sudocmdgroup1(request):
+tracker = SudoCmdGroupTracker(u'testsudocmdgroup1', u'Test desc1')
+return tracker.make_fixture(request)
+
+
+@pytest.fixture(scope='class')
+def sudocmdgroup2(request):
+tracker = SudoCmdGroupTracker(u'testsudocmdgroup2', u'Test desc2')
+return tracker.make_fixture(request)
+
+
+@pytest.mark.tier1
+class TestSudoCmdGroupNonexistent(XMLRPC_test):
+def test_retrieve_nonexistent(self, sudocmdgroup1, sudocmdgroup2):
+""" Try to retrieve non-existent sudocmdgroups """
+sudocmdgroup1.ensure_missing()
+command = sudocmdgroup1.make_retrieve_command()
+with raises_exact(errors.NotFound(
+reason=u'%s: sudo command group not found' % sudocmdgroup1.cn)):
+command()
+
+sudocmdgroup2.ensure_missing()
+command = sudocmdgroup2.make_retrieve_command()
+with raises_exac

Re: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, create SudoCmdGroupTracker

2016-02-11 Thread Aleš Mareček 
NACK.

"create_sudocmd" and "delete_sudocmd" should be imported from Tracker, not from 
the previous test (sudocmd_plugin).

  - alich -

- Original Message -
> From: "Filip Skola" <fsk...@redhat.com>
> To: freeipa-devel@redhat.com
> Sent: Thursday, January 28, 2016 12:49:17 PM
> Subject: [Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, 
> create SudoCmdGroupTracker
> 
> Hi,
> 
> sending the next sudo patch. This one depends on the previous one
> (sudocmd_plugin).
> 
> Filip
> 
> --
> Manage your subscription for the Freeipa-devel mailing list:
> https://www.redhat.com/mailman/listinfo/freeipa-devel
> Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

[Freeipa-devel] [PATCH] 0008 Refactor test_sudocmdgroup_plugin, create SudoCmdGroupTracker

2016-01-28 Thread Filip Skola 
Hi,

sending the next sudo patch. This one depends on the previous one 
(sudocmd_plugin).

Filip
From 9aab785cf39233998f42917b10cab3ef976f91f1 Mon Sep 17 00:00:00 2001
From: Filip Skola 
Date: Thu, 28 Jan 2016 11:57:08 +0100
Subject: [PATCH] Refactor test_sudocmdgroup_plugin, create SudoCmdGroupTracker

---
 ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py   | 854 +
 .../test_xmlrpc/tracker/sudocmdgroup_plugin.py | 234 ++
 2 files changed, 433 insertions(+), 655 deletions(-)
 create mode 100644 ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py

diff --git a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
index c72ba2f7a25d5b3c4817c7e17346a8ff5a324760..74575e2c846dcdc6db29f1bab454543da8e5d856 100644
--- a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
@@ -21,677 +21,221 @@ Test the `ipalib/plugins/sudocmdgroup.py` module.
 """
 
 from ipalib import api, errors
-from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
-  fuzzy_sudocmddn)
-from ipapython.dn import DN
+from ipatests.util import assert_deepequal
+from ipatests.test_xmlrpc.xmlrpc_test import (XMLRPC_test, fuzzy_sudocmddn,
+  raises_exact)
+from ipatests.test_xmlrpc.tracker.sudocmdgroup_plugin import SudoCmdGroupTracker
+from ipatests.test_xmlrpc.test_sudocmd_plugin import create_sudocmd, delete_sudocmd
 import pytest
 
-sudocmdgroup1 = u'testsudocmdgroup1'
-sudocmdgroup2 = u'testsudocmdgroup2'
-sudocmd1 = u'/usr/bin/sudotestcmd1'
-sudocmd1_camelcase = u'/usr/bin/sudoTestCmd1'
-sudocmd_plus = u'/bin/ls -l /lost+found/*'
-
-def create_command(sudocmd):
-return dict(
-desc='Create %r' % sudocmd,
-command=(
-'sudocmd_add', [], dict(sudocmd=sudocmd,
-description=u'Test sudo command')
-),
-expected=dict(
-value=sudocmd,
-summary=u'Added Sudo Command "%s"' % sudocmd,
-result=dict(
-objectclass=objectclasses.sudocmd,
-sudocmd=[sudocmd],
-ipauniqueid=[fuzzy_uuid], description=[u'Test sudo command'],
-dn=fuzzy_sudocmddn,
-),
-),
-)
 
+sudocmd1_desc = u'Test sudo command 1'
+sudocmd2_desc = u'Test sudo command 2'
+sudocmd_plus_desc = u'Test sudo command 3'
 
-@pytest.mark.tier1
-class test_sudocmdgroup(Declarative):
-cleanup_commands = [
-('sudocmdgroup_del', [sudocmdgroup1], {}),
-('sudocmdgroup_del', [sudocmdgroup2], {}),
-('sudocmd_del', [sudocmd1], {}),
-('sudocmd_del', [sudocmd1_camelcase], {}),
-('sudocmd_del', [sudocmd_plus], {}),
-]
-
-tests = [
-
-
-# create sudo command
-dict(
-desc='Create %r' % sudocmd1,
-command=(
-'sudocmd_add', [], dict(sudocmd=sudocmd1, description=u'Test sudo command 1')
-),
-expected=dict(
-value=sudocmd1,
-summary=u'Added Sudo Command "%s"' % sudocmd1,
-result=dict(
-objectclass=objectclasses.sudocmd,
-sudocmd=[u'/usr/bin/sudotestcmd1'],
-ipauniqueid=[fuzzy_uuid],
-description=[u'Test sudo command 1'],
-dn=fuzzy_sudocmddn,
-),
-),
-),
-
-dict(
-desc='Create %r' % sudocmd1_camelcase,
-command=(
-'sudocmd_add', [], dict(sudocmd=sudocmd1_camelcase, description=u'Test sudo command 2')
-),
-expected=dict(
-value=sudocmd1_camelcase,
-summary=u'Added Sudo Command "%s"' % sudocmd1_camelcase,
-result=dict(
-objectclass=objectclasses.sudocmd,
-sudocmd=[u'/usr/bin/sudoTestCmd1'],
-ipauniqueid=[fuzzy_uuid],
-description=[u'Test sudo command 2'],
-dn=fuzzy_sudocmddn,
-),
-),
-),
 
-dict(
-desc='Verify the managed sudo command %r was created' % sudocmd1,
-command=('sudocmd_show', [sudocmd1], {}),
-expected=dict(
-value=sudocmd1,
-summary=None,
-result=dict(
-sudocmd=[sudocmd1],
-description=[u'Test sudo command 1'],
-dn=fuzzy_sudocmddn,
-),
-),
-),
-
-
-
-# create sudo command group1:
-dict(
-desc='Try to retrieve non-existent %r' % sudocmdgroup1,
-command=('sudocmdgroup_show', [sudocmdgroup1], {}),
-