Re: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin
On 03/01/2016 01:27 PM, Aleš Mareček wrote: > ACK. > Thank you! > - alich - > > - Original Message - >> From: "Filip Skola" >> To: "Aleš Mareček" >> Cc: freeipa-devel@redhat.com, "Milan Kubík" >> Sent: Wednesday, February 24, 2016 8:07:55 PM >> Subject: Re: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin >> >> Hi, >> >> these problems have been fixed. >> >> F. >> >> - Original Message - >>> NACK. >>> Some little changes still required: >>> * fixing the pep8 errors >>> * fixing the wrong comment >>> >>> [root@master2 freeipa]# pep8 ipatests/test_xmlrpc/test_sudocmd_plugin.py >>> ipatests/test_xmlrpc/test_sudocmd_plugin.py:94:80: E501 line too long (87 > >>> 79 characters) >>> ipatests/test_xmlrpc/test_sudocmd_plugin.py:97:80: E501 line too long (87 > >>> 79 characters) >>> ipatests/test_xmlrpc/test_sudocmd_plugin.py:134:80: E501 line too long (80 >>>> >>> 79 characters) >>> >>> [root@master2 freeipa]# pep8 ipatests/test_xmlrpc/tracker/sudocmd_plugin.py >>> ipatests/test_xmlrpc/tracker/sudocmd_plugin.py:14:80: E501 line too long >>> (81 >>>> 79 characters) >>> >>> [root@master2 freeipa]# grep 'Class for' >>> ipatests/test_xmlrpc/tracker/sudocmd_plugin.py >>> """ Class for host plugin like tests """ >>> >>> >>> - Original Message - >>>> From: "Filip Skola" >>>> To: "Aleš Mareček" >>>> Cc: freeipa-devel@redhat.com, "Milan Kubík" >>>> Sent: Monday, February 22, 2016 1:59:43 PM >>>> Subject: Re: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin >>>> >>>> Hi, >>>> >>>> sudocmd tracker has been created. >>>> >>>> Filip >>>> >>>> - Original Message - >>>>> NACK. >>>>> >>>>> "create_sudocmd" and "delete_sudocmd" should be placed in Tracker. So >>>>> this >>>>> patch should create the tracker as well. >>>>> >>>>> - Original Message - >>>>>> From: "Filip Skola" >>>>>> To: freeipa-devel@redhat.com >>>>>> Sent: Monday, January 25, 2016 3:57:25 PM >>>>>> Subject: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin >>>>>> >>>>>> Hello, >>>>>> >>>>>> attaching refactored 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: 007c360f85151caab7d608cc0a4eb1916b18eba9 Note: Please keep to down-posting on freeipa-devel. -- 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] 0007 Refactor test_sudocmd_plugin
ACK. Thank you! - alich - - Original Message - > From: "Filip Skola" > To: "Aleš Mareček" > Cc: freeipa-devel@redhat.com, "Milan Kubík" > Sent: Wednesday, February 24, 2016 8:07:55 PM > Subject: Re: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin > > Hi, > > these problems have been fixed. > > F. > > - Original Message - > > NACK. > > Some little changes still required: > > * fixing the pep8 errors > > * fixing the wrong comment > > > > [root@master2 freeipa]# pep8 ipatests/test_xmlrpc/test_sudocmd_plugin.py > > ipatests/test_xmlrpc/test_sudocmd_plugin.py:94:80: E501 line too long (87 > > > 79 characters) > > ipatests/test_xmlrpc/test_sudocmd_plugin.py:97:80: E501 line too long (87 > > > 79 characters) > > ipatests/test_xmlrpc/test_sudocmd_plugin.py:134:80: E501 line too long (80 > > > > > 79 characters) > > > > [root@master2 freeipa]# pep8 ipatests/test_xmlrpc/tracker/sudocmd_plugin.py > > ipatests/test_xmlrpc/tracker/sudocmd_plugin.py:14:80: E501 line too long > > (81 > > > 79 characters) > > > > [root@master2 freeipa]# grep 'Class for' > > ipatests/test_xmlrpc/tracker/sudocmd_plugin.py > > """ Class for host plugin like tests """ > > > > > > - Original Message - > > > From: "Filip Skola" > > > To: "Aleš Mareček" > > > Cc: freeipa-devel@redhat.com, "Milan Kubík" > > > Sent: Monday, February 22, 2016 1:59:43 PM > > > Subject: Re: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin > > > > > > Hi, > > > > > > sudocmd tracker has been created. > > > > > > Filip > > > > > > - Original Message - > > > > NACK. > > > > > > > > "create_sudocmd" and "delete_sudocmd" should be placed in Tracker. So > > > > this > > > > patch should create the tracker as well. > > > > > > > > - Original Message - > > > > > From: "Filip Skola" > > > > > To: freeipa-devel@redhat.com > > > > > Sent: Monday, January 25, 2016 3:57:25 PM > > > > > Subject: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin > > > > > > > > > > Hello, > > > > > > > > > > attaching refactored 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] 0007 Refactor test_sudocmd_plugin
Hi,
these problems have been fixed.
F.
- Original Message -
> NACK.
> Some little changes still required:
> * fixing the pep8 errors
> * fixing the wrong comment
>
> [root@master2 freeipa]# pep8 ipatests/test_xmlrpc/test_sudocmd_plugin.py
> ipatests/test_xmlrpc/test_sudocmd_plugin.py:94:80: E501 line too long (87 >
> 79 characters)
> ipatests/test_xmlrpc/test_sudocmd_plugin.py:97:80: E501 line too long (87 >
> 79 characters)
> ipatests/test_xmlrpc/test_sudocmd_plugin.py:134:80: E501 line too long (80 >
> 79 characters)
>
> [root@master2 freeipa]# pep8 ipatests/test_xmlrpc/tracker/sudocmd_plugin.py
> ipatests/test_xmlrpc/tracker/sudocmd_plugin.py:14:80: E501 line too long (81
> > 79 characters)
>
> [root@master2 freeipa]# grep 'Class for'
> ipatests/test_xmlrpc/tracker/sudocmd_plugin.py
> """ Class for host plugin like tests """
>
>
> - Original Message -
> > From: "Filip Skola"
> > To: "Aleš Mareček"
> > Cc: freeipa-devel@redhat.com, "Milan Kubík"
> > Sent: Monday, February 22, 2016 1:59:43 PM
> > Subject: Re: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin
> >
> > Hi,
> >
> > sudocmd tracker has been created.
> >
> > Filip
> >
> > - Original Message -
> > > NACK.
> > >
> > > "create_sudocmd" and "delete_sudocmd" should be placed in Tracker. So
> > > this
> > > patch should create the tracker as well.
> > >
> > > - Original Message -
> > > > From: "Filip Skola"
> > > > To: freeipa-devel@redhat.com
> > > > Sent: Monday, January 25, 2016 3:57:25 PM
> > > > Subject: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin
> > > >
> > > > Hello,
> > > >
> > > > attaching refactored 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 1da1bdc46eb96b966e060b0ad83a3edebcc9c37b Mon Sep 17 00:00:00 2001
From: Filip Skola
Date: Mon, 18 Jan 2016 13:56:44 +0100
Subject: [PATCH] Refactor test_sudocmd_plugin
---
ipatests/test_xmlrpc/test_sudocmd_plugin.py| 448 +
ipatests/test_xmlrpc/tracker/sudocmd_plugin.py | 113 +++
2 files changed, 269 insertions(+), 292 deletions(-)
create mode 100644 ipatests/test_xmlrpc/tracker/sudocmd_plugin.py
diff --git a/ipatests/test_xmlrpc/test_sudocmd_plugin.py b/ipatests/test_xmlrpc/test_sudocmd_plugin.py
index 2056118ba763be45e78ddf6643059e32d7680af8..7ffe7a1d0497ad9c755ccdbe057fee1a13523f20 100644
--- a/ipatests/test_xmlrpc/test_sudocmd_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmd_plugin.py
@@ -21,309 +21,173 @@
Test the `ipalib/plugins/sudocmd.py` module.
"""
-from ipalib import errors
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_sudocmddn,
-fuzzy_uuid)
-from ipatests.test_xmlrpc import objectclasses
+from ipalib import api, errors
+from ipatests.util import assert_deepequal
+from ipatests.test_xmlrpc.xmlrpc_test import (XMLRPC_test, raises_exact)
+from ipatests.test_xmlrpc.tracker.sudocmd_plugin import SudoCmdTracker
import pytest
-sudocmd1 = u'/usr/bin/sudotestcmd1'
-sudocmd1_camelcase = u'/usr/bin/sudoTestCmd1'
-sudorule1 = u'test_sudorule1'
+@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.mark.tier1
-class test_sudocmd(Declarative):
-
-cleanup_commands = [
-('sudocmd_del', [sudocmd1], {}),
-('sudocmd_del', [sudocmd1_camelcase], {}),
-('sudorule_del', [sudorule1], {}),
-]
-
-tests = [
-
-dict(
-desc='Try to retrieve non-existent %r' % sudocmd1,
-command=('sudocmd_show', [sudocmd1], {}),
-expected=errors.NotFound(
-reason=u'%s: sudo command not found' % sudocmd1),
-),
-
-
-dict(
-desc='Try to update non-existent %r' % sudocmd1,
-command=('sudocmd_mod', [sudocmd1], dict(description=u'Nope')),
-expected=errors.NotFound(
-reason=u'%s: sudo command not found' % sudocmd1),
-
Re: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin
NACK. Some little changes still required: * fixing the pep8 errors * fixing the wrong comment [root@master2 freeipa]# pep8 ipatests/test_xmlrpc/test_sudocmd_plugin.py ipatests/test_xmlrpc/test_sudocmd_plugin.py:94:80: E501 line too long (87 > 79 characters) ipatests/test_xmlrpc/test_sudocmd_plugin.py:97:80: E501 line too long (87 > 79 characters) ipatests/test_xmlrpc/test_sudocmd_plugin.py:134:80: E501 line too long (80 > 79 characters) [root@master2 freeipa]# pep8 ipatests/test_xmlrpc/tracker/sudocmd_plugin.py ipatests/test_xmlrpc/tracker/sudocmd_plugin.py:14:80: E501 line too long (81 > 79 characters) [root@master2 freeipa]# grep 'Class for' ipatests/test_xmlrpc/tracker/sudocmd_plugin.py """ Class for host plugin like tests """ - Original Message - > From: "Filip Skola" > To: "Aleš Mareček" > Cc: freeipa-devel@redhat.com, "Milan Kubík" > Sent: Monday, February 22, 2016 1:59:43 PM > Subject: Re: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin > > Hi, > > sudocmd tracker has been created. > > Filip > > - Original Message - > > NACK. > > > > "create_sudocmd" and "delete_sudocmd" should be placed in Tracker. So this > > patch should create the tracker as well. > > > > - Original Message - > > > From: "Filip Skola" > > > To: freeipa-devel@redhat.com > > > Sent: Monday, January 25, 2016 3:57:25 PM > > > Subject: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin > > > > > > Hello, > > > > > > attaching refactored 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] 0007 Refactor test_sudocmd_plugin
Hi,
sudocmd tracker has been created.
Filip
- Original Message -
> NACK.
>
> "create_sudocmd" and "delete_sudocmd" should be placed in Tracker. So this
> patch should create the tracker as well.
>
> - Original Message -
> > From: "Filip Skola"
> > To: freeipa-devel@redhat.com
> > Sent: Monday, January 25, 2016 3:57:25 PM
> > Subject: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin
> >
> > Hello,
> >
> > attaching refactored 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 bcb240e47afbf16524c341e1cd4ac621ccb1d3cf Mon Sep 17 00:00:00 2001
From: Filip Skola
Date: Mon, 18 Jan 2016 13:56:44 +0100
Subject: [PATCH] Refactor test_sudocmd_plugin
---
ipatests/test_xmlrpc/test_sudocmd_plugin.py| 446 +
ipatests/test_xmlrpc/tracker/sudocmd_plugin.py | 112 +++
2 files changed, 266 insertions(+), 292 deletions(-)
create mode 100644 ipatests/test_xmlrpc/tracker/sudocmd_plugin.py
diff --git a/ipatests/test_xmlrpc/test_sudocmd_plugin.py b/ipatests/test_xmlrpc/test_sudocmd_plugin.py
index 2056118ba763be45e78ddf6643059e32d7680af8..74340e4b8b5335e20f0f4c6e1ec0b698232b0ea9 100644
--- a/ipatests/test_xmlrpc/test_sudocmd_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmd_plugin.py
@@ -21,309 +21,171 @@
Test the `ipalib/plugins/sudocmd.py` module.
"""
-from ipalib import errors
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_sudocmddn,
-fuzzy_uuid)
-from ipatests.test_xmlrpc import objectclasses
+from ipalib import api, errors
+from ipatests.util import assert_deepequal
+from ipatests.test_xmlrpc.xmlrpc_test import (XMLRPC_test, raises_exact)
+from ipatests.test_xmlrpc.tracker.sudocmd_plugin import SudoCmdTracker
import pytest
-sudocmd1 = u'/usr/bin/sudotestcmd1'
-sudocmd1_camelcase = u'/usr/bin/sudoTestCmd1'
-sudorule1 = u'test_sudorule1'
+@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.mark.tier1
-class test_sudocmd(Declarative):
-
-cleanup_commands = [
-('sudocmd_del', [sudocmd1], {}),
-('sudocmd_del', [sudocmd1_camelcase], {}),
-('sudorule_del', [sudorule1], {}),
-]
-
-tests = [
-
-dict(
-desc='Try to retrieve non-existent %r' % sudocmd1,
-command=('sudocmd_show', [sudocmd1], {}),
-expected=errors.NotFound(
-reason=u'%s: sudo command not found' % sudocmd1),
-),
-
-
-dict(
-desc='Try to update non-existent %r' % sudocmd1,
-command=('sudocmd_mod', [sudocmd1], dict(description=u'Nope')),
-expected=errors.NotFound(
-reason=u'%s: sudo command not found' % sudocmd1),
-),
-
-
-dict(
-desc='Try to delete non-existent %r' % sudocmd1,
-command=('sudocmd_del', [sudocmd1], {}),
-expected=errors.NotFound(
-reason=u'%s: sudo command not found' % sudocmd1),
-),
-
-
-dict(
-desc='Create %r' % sudocmd1,
-command=('sudocmd_add', [sudocmd1],
-dict(
-description=u'Test sudo command 1',
-),
-),
-expected=dict(
-value=sudocmd1,
-summary=u'Added Sudo Command "%s"' % sudocmd1,
-result=dict(
-dn=fuzzy_sudocmddn,
-sudocmd=[sudocmd1],
-description=[u'Test sudo command 1'],
-objectclass=objectclasses.sudocmd,
-ipauniqueid=[fuzzy_uuid],
-),
-),
-),
-
-dict(
-desc='Create %r' % sudocmd1_camelcase,
-command=('sudocmd_add', [sudocmd1_camelcase],
-dict(
-description=u'Test sudo command 2',
-),
-),
-expected=dict(
-value=sudocmd1_camelcase,
-summary=u'Added Sudo Command "%s"' % sudocmd1_camelcase,
-result=dict(
-dn=fuzzy_sudocmddn,
-sudocmd=[sudocmd1_camelcase],
-description=[u'Test sudo command 2'],
-objectclass=objectclasses.sudocmd,
-ipauniqueid=[fuzzy_uuid],
-),
-),
-),
-
-
-dict(
-desc='Try to create duplicate %r' % sudocmd1,
-command=('sudocmd_add', [sudocmd1],
-dict(
-description=u'Test sudo command 1',
-),
-),
-expected=errors.DuplicateEntry(message=u'sudo comma
Re: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin
NACK. "create_sudocmd" and "delete_sudocmd" should be placed in Tracker. So this patch should create the tracker as well. - Original Message - > From: "Filip Skola" > To: freeipa-devel@redhat.com > Sent: Monday, January 25, 2016 3:57:25 PM > Subject: [Freeipa-devel] [PATCH] 0007 Refactor test_sudocmd_plugin > > Hello, > > attaching refactored 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
