Re: [Freeipa-devel] [PATCH 0005] Refactor test_nesting, create HostGroupTracker
On 24.03.2016 11:59, Milan Kubík wrote: On 03/11/2016 03:42 PM, Filip Skola wrote: - Original Message - On 01/28/2016 10:45 AM, Filip Skola wrote: The same as with patch 0002: * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin W:142,26: Calling a dict.iter*() method (dict-iter-method) Please use dict.items method. -- Milan Kubik Hi, attaching a fixed patch. This patch is dependent on updated group plugin test patch 0002-7. Filip Hello, sorry for delay. The patch no longer applies after 0002-8. -- Milan Kubik Hi, rebased. The next patch should be applicable on top of this one. Filip Sorry for long delays. ACK. Pushed to master: ab3f652dc105a4a88911c786e77221441977b30d -- 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 0005] Refactor test_nesting, create HostGroupTracker
On 03/11/2016 03:42 PM, Filip Skola wrote: - Original Message - On 01/28/2016 10:45 AM, Filip Skola wrote: The same as with patch 0002: * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin W:142,26: Calling a dict.iter*() method (dict-iter-method) Please use dict.items method. -- Milan Kubik Hi, attaching a fixed patch. This patch is dependent on updated group plugin test patch 0002-7. Filip Hello, sorry for delay. The patch no longer applies after 0002-8. -- Milan Kubik Hi, rebased. The next patch should be applicable on top of this one. Filip Sorry for long delays. ACK. -- Milan Kubik -- 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 0005] Refactor test_nesting, create HostGroupTracker
- Original Message - > On 01/28/2016 10:45 AM, Filip Skola wrote: > > > >> The same as with patch 0002: > >> * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin > >> W:142,26: Calling a dict.iter*() method (dict-iter-method) > >> > >> Please use dict.items method. > >> > >> -- > >> Milan Kubik > >> > >> > > Hi, > > > > attaching a fixed patch. This patch is dependent on updated group plugin > > test patch 0002-7. > > > > Filip > Hello, sorry for delay. The patch no longer applies after 0002-8. > > -- > Milan Kubik > > Hi, rebased. The next patch should be applicable on top of this one. FilipFrom 120ea060fba92afa61ad559ccd3037835703b045 Mon Sep 17 00:00:00 2001 From: Filip Skola Date: Thu, 10 Mar 2016 17:17:20 +0100 Subject: [PATCH] Refactor test_nesting, create HostGroupTracker --- ipatests/test_xmlrpc/test_nesting.py | 776 +-- ipatests/test_xmlrpc/tracker/group_plugin.py | 5 +- ipatests/test_xmlrpc/tracker/host_plugin.py | 1 + ipatests/test_xmlrpc/tracker/hostgroup_plugin.py | 248 4 files changed, 401 insertions(+), 629 deletions(-) create mode 100644 ipatests/test_xmlrpc/tracker/hostgroup_plugin.py diff --git a/ipatests/test_xmlrpc/test_nesting.py b/ipatests/test_xmlrpc/test_nesting.py index c3bf1ce84e0bef412c44ed847e7e0fc4648a4b74..f78a6e54bd7a94cb9d2645f5bdc5d5c109a79b1f 100644 --- a/ipatests/test_xmlrpc/test_nesting.py +++ b/ipatests/test_xmlrpc/test_nesting.py @@ -20,193 +20,93 @@ Test group nesting and indirect members """ -from ipalib import api -from ipatests.test_xmlrpc import objectclasses -from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits, - fuzzy_uuid) -from ipapython.dn import DN -from ipatests.test_xmlrpc.test_user_plugin import get_user_result +from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test +from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker +from ipatests.test_xmlrpc.tracker.group_plugin import GroupTracker +from ipatests.test_xmlrpc.tracker.host_plugin import HostTracker +from ipatests.test_xmlrpc.tracker.hostgroup_plugin import HostGroupTracker import pytest -group1 = u'testgroup1' -group2 = u'testgroup2' -group3 = u'testgroup3' -group4 = u'testgroup4' -user1 = u'tuser1' -user2 = u'tuser2' -user3 = u'tuser3' -user4 = u'tuser4' - -hostgroup1 = u'testhostgroup1' -hgdn1 = DN(('cn',hostgroup1),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) -hostgroup2 = u'testhostgroup2' -hgdn2 = DN(('cn',hostgroup2),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) - -fqdn1 = u'testhost1.%s' % api.env.domain -host_dn1 = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'), - api.env.basedn) + +@pytest.fixture(scope='class') +def user1(request): +tracker = UserTracker(name=u'tuser1', givenname=u'Test1', sn=u'User1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user2(request): +tracker = UserTracker(name=u'tuser2', givenname=u'Test2', sn=u'User2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user3(request): +tracker = UserTracker(name=u'tuser3', givenname=u'Test3', sn=u'User3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user4(request): +tracker = UserTracker(name=u'tuser4', givenname=u'Test4', sn=u'User4') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group1(request): +tracker = GroupTracker(name=u'testgroup1', description=u'Test desc1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group2(request): +tracker = GroupTracker(name=u'testgroup2', description=u'Test desc2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group3(request): +tracker = GroupTracker(name=u'testgroup3', description=u'Test desc3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group4(request): +tracker = GroupTracker(name=u'testgroup4', description=u'Test desc4') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def host1(request): +tracker = HostTracker(name=u'host1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def hostgroup1(request): +tracker = HostGroupTracker(name=u'hostgroup1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def hostgroup2(request): +tracker = HostGroupTracker(name=u'hostgroup2') +return tracker.make_fixture(request) @pytest.mark.tier1 -class test_nesting(Declarative): -cleanup_commands = [ -('group_del', [group1], {}), -('group_del', [group2], {}), -('group_del', [group3], {}), -('group_del', [group4], {}), -('user_del', [user1], {}), -('user_del', [user2], {}), -('user_del', [user3], {}), -('user_del', [us
Re: [Freeipa-devel] [PATCH 0005] Refactor test_nesting, create HostGroupTracker
On 01/28/2016 10:45 AM, Filip Skola wrote: The same as with patch 0002: * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin W:142,26: Calling a dict.iter*() method (dict-iter-method) Please use dict.items method. -- Milan Kubik Hi, attaching a fixed patch. This patch is dependent on updated group plugin test patch 0002-7. Filip Hello, sorry for delay. The patch no longer applies after 0002-8. -- Milan Kubik -- 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 0005] Refactor test_nesting, create HostGroupTracker
On 28.01.2016 10:45, Filip Skola wrote: - Original Message - On 01/18/2016 02:26 PM, Filip Skola wrote: Hi, this should be fixed in this patch. F. - Original Message - On 01/15/2016 03:37 PM, Filip Skola wrote: Hi, sending rebased patch. F. - Original Message - Hi, the patch no longer applies to master. Please rebase it. Thanks, Milan - Original Message - From: "Filip Skola" To: freeipa-devel@redhat.com Cc: "Milan Kubík" , "Aleš Mareček" Sent: Tuesday, 22 December, 2015 11:56:15 AM Subject: [PATCH 0005] Refactor test_nesting, create HostGroupTracker Hi, another patch from refactoring-test_xmlrpc series. Filip NACK, something seems to be missing in the patch * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin ipatests/test_xmlrpc/tracker/hostgroup_plugin.py:222: [E1101(no-member), HostGroupTracker.check_add_member_negative] Instance of 'HostGroupTracker' has no 'adds' member) -- Milan Kubik The same as with patch 0002: * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin W:142,26: Calling a dict.iter*() method (dict-iter-method) Please use dict.items method. -- Milan Kubik Hi, attaching a fixed patch. This patch is dependent on updated group plugin test patch 0002-7. Filip Bump for review -- 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 0005] Refactor test_nesting, create HostGroupTracker
- Original Message - > On 01/18/2016 02:26 PM, Filip Skola wrote: > > Hi, > > > > this should be fixed in this patch. > > > > F. > > > > - Original Message - > >> On 01/15/2016 03:37 PM, Filip Skola wrote: > >>> Hi, > >>> > >>> sending rebased patch. > >>> > >>> F. > >>> > >>> - Original Message - > Hi, > > the patch no longer applies to master. Please rebase it. > > Thanks, > Milan > > - Original Message - > From: "Filip Skola" > To: freeipa-devel@redhat.com > Cc: "Milan Kubík" , "Aleš Mareček" > > Sent: Tuesday, 22 December, 2015 11:56:15 AM > Subject: [PATCH 0005] Refactor test_nesting, create HostGroupTracker > > Hi, > > another patch from refactoring-test_xmlrpc series. > > Filip > > >> NACK, something seems to be missing in the patch > >> > >> > >> * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin > >> ipatests/test_xmlrpc/tracker/hostgroup_plugin.py:222: [E1101(no-member), > >> HostGroupTracker.check_add_member_negative] Instance of > >> 'HostGroupTracker' has no 'adds' member) > >> > >> -- > >> Milan Kubik > >> > >> > The same as with patch 0002: > * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin > W:142,26: Calling a dict.iter*() method (dict-iter-method) > > Please use dict.items method. > > -- > Milan Kubik > > Hi, attaching a fixed patch. This patch is dependent on updated group plugin test patch 0002-7. Filip From 5dee3969a039241411ec1648d9ba1b87c149ccf3 Mon Sep 17 00:00:00 2001 From: Filip Skola Date: Thu, 28 Jan 2016 10:29:04 +0100 Subject: [PATCH] Refactor test_nesting, create HostGroupTracker --- ipatests/test_xmlrpc/test_nesting.py | 776 - ipatests/test_xmlrpc/tracker/group_plugin.py | 4 +- ipatests/test_xmlrpc/tracker/host_plugin.py| 1 + .../{group_plugin.py => hostgroup_plugin.py} | 227 +++--- 4 files changed, 259 insertions(+), 749 deletions(-) copy ipatests/test_xmlrpc/tracker/{group_plugin.py => hostgroup_plugin.py} (51%) diff --git a/ipatests/test_xmlrpc/test_nesting.py b/ipatests/test_xmlrpc/test_nesting.py index c3bf1ce84e0bef412c44ed847e7e0fc4648a4b74..f78a6e54bd7a94cb9d2645f5bdc5d5c109a79b1f 100644 --- a/ipatests/test_xmlrpc/test_nesting.py +++ b/ipatests/test_xmlrpc/test_nesting.py @@ -20,193 +20,93 @@ Test group nesting and indirect members """ -from ipalib import api -from ipatests.test_xmlrpc import objectclasses -from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits, - fuzzy_uuid) -from ipapython.dn import DN -from ipatests.test_xmlrpc.test_user_plugin import get_user_result +from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test +from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker +from ipatests.test_xmlrpc.tracker.group_plugin import GroupTracker +from ipatests.test_xmlrpc.tracker.host_plugin import HostTracker +from ipatests.test_xmlrpc.tracker.hostgroup_plugin import HostGroupTracker import pytest -group1 = u'testgroup1' -group2 = u'testgroup2' -group3 = u'testgroup3' -group4 = u'testgroup4' -user1 = u'tuser1' -user2 = u'tuser2' -user3 = u'tuser3' -user4 = u'tuser4' - -hostgroup1 = u'testhostgroup1' -hgdn1 = DN(('cn',hostgroup1),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) -hostgroup2 = u'testhostgroup2' -hgdn2 = DN(('cn',hostgroup2),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) - -fqdn1 = u'testhost1.%s' % api.env.domain -host_dn1 = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'), - api.env.basedn) + +@pytest.fixture(scope='class') +def user1(request): +tracker = UserTracker(name=u'tuser1', givenname=u'Test1', sn=u'User1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user2(request): +tracker = UserTracker(name=u'tuser2', givenname=u'Test2', sn=u'User2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user3(request): +tracker = UserTracker(name=u'tuser3', givenname=u'Test3', sn=u'User3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user4(request): +tracker = UserTracker(name=u'tuser4', givenname=u'Test4', sn=u'User4') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group1(request): +tracker = GroupTracker(name=u'testgroup1', description=u'Test desc1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group2(request): +tracker = GroupTracker(name=u'testgroup2', description=u'Test desc2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group3(request): +tracker = GroupTracker(name=u'testgroup3', description=u'Test desc3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group4(request): +tracker = GroupTra
Re: [Freeipa-devel] [PATCH 0005] Refactor test_nesting, create HostGroupTracker
On 01/18/2016 02:26 PM, Filip Skola wrote: Hi, this should be fixed in this patch. F. - Original Message - On 01/15/2016 03:37 PM, Filip Skola wrote: Hi, sending rebased patch. F. - Original Message - Hi, the patch no longer applies to master. Please rebase it. Thanks, Milan - Original Message - From: "Filip Skola" To: freeipa-devel@redhat.com Cc: "Milan Kubík" , "Aleš Mareček" Sent: Tuesday, 22 December, 2015 11:56:15 AM Subject: [PATCH 0005] Refactor test_nesting, create HostGroupTracker Hi, another patch from refactoring-test_xmlrpc series. Filip NACK, something seems to be missing in the patch * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin ipatests/test_xmlrpc/tracker/hostgroup_plugin.py:222: [E1101(no-member), HostGroupTracker.check_add_member_negative] Instance of 'HostGroupTracker' has no 'adds' member) -- Milan Kubik The same as with patch 0002: * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin W:142,26: Calling a dict.iter*() method (dict-iter-method) Please use dict.items method. -- Milan Kubik -- 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 0005] Refactor test_nesting, create HostGroupTracker
Hi, this should be fixed in this patch. F. - Original Message - > On 01/15/2016 03:37 PM, Filip Skola wrote: > > Hi, > > > > sending rebased patch. > > > > F. > > > > - Original Message - > >> Hi, > >> > >> the patch no longer applies to master. Please rebase it. > >> > >> Thanks, > >> Milan > >> > >> - Original Message - > >> From: "Filip Skola" > >> To: freeipa-devel@redhat.com > >> Cc: "Milan Kubík" , "Aleš Mareček" > >> > >> Sent: Tuesday, 22 December, 2015 11:56:15 AM > >> Subject: [PATCH 0005] Refactor test_nesting, create HostGroupTracker > >> > >> Hi, > >> > >> another patch from refactoring-test_xmlrpc series. > >> > >> Filip > >> > NACK, something seems to be missing in the patch > > > * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin > ipatests/test_xmlrpc/tracker/hostgroup_plugin.py:222: [E1101(no-member), > HostGroupTracker.check_add_member_negative] Instance of > 'HostGroupTracker' has no 'adds' member) > > -- > Milan Kubik > > From ed2fd7dbc301ada9ed35452832418b520d27f6e8 Mon Sep 17 00:00:00 2001 From: Filip Skola Date: Fri, 15 Jan 2016 15:08:46 +0100 Subject: [PATCH] Refactor test_nesting, create HostGroupTracker --- ipatests/test_xmlrpc/test_nesting.py | 776 - ipatests/test_xmlrpc/tracker/group_plugin.py | 4 +- ipatests/test_xmlrpc/tracker/host_plugin.py| 1 + .../{group_plugin.py => hostgroup_plugin.py} | 225 +++--- 4 files changed, 258 insertions(+), 748 deletions(-) copy ipatests/test_xmlrpc/tracker/{group_plugin.py => hostgroup_plugin.py} (51%) diff --git a/ipatests/test_xmlrpc/test_nesting.py b/ipatests/test_xmlrpc/test_nesting.py index c3bf1ce84e0bef412c44ed847e7e0fc4648a4b74..f78a6e54bd7a94cb9d2645f5bdc5d5c109a79b1f 100644 --- a/ipatests/test_xmlrpc/test_nesting.py +++ b/ipatests/test_xmlrpc/test_nesting.py @@ -20,193 +20,93 @@ Test group nesting and indirect members """ -from ipalib import api -from ipatests.test_xmlrpc import objectclasses -from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits, - fuzzy_uuid) -from ipapython.dn import DN -from ipatests.test_xmlrpc.test_user_plugin import get_user_result +from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test +from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker +from ipatests.test_xmlrpc.tracker.group_plugin import GroupTracker +from ipatests.test_xmlrpc.tracker.host_plugin import HostTracker +from ipatests.test_xmlrpc.tracker.hostgroup_plugin import HostGroupTracker import pytest -group1 = u'testgroup1' -group2 = u'testgroup2' -group3 = u'testgroup3' -group4 = u'testgroup4' -user1 = u'tuser1' -user2 = u'tuser2' -user3 = u'tuser3' -user4 = u'tuser4' - -hostgroup1 = u'testhostgroup1' -hgdn1 = DN(('cn',hostgroup1),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) -hostgroup2 = u'testhostgroup2' -hgdn2 = DN(('cn',hostgroup2),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) - -fqdn1 = u'testhost1.%s' % api.env.domain -host_dn1 = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'), - api.env.basedn) + +@pytest.fixture(scope='class') +def user1(request): +tracker = UserTracker(name=u'tuser1', givenname=u'Test1', sn=u'User1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user2(request): +tracker = UserTracker(name=u'tuser2', givenname=u'Test2', sn=u'User2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user3(request): +tracker = UserTracker(name=u'tuser3', givenname=u'Test3', sn=u'User3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user4(request): +tracker = UserTracker(name=u'tuser4', givenname=u'Test4', sn=u'User4') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group1(request): +tracker = GroupTracker(name=u'testgroup1', description=u'Test desc1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group2(request): +tracker = GroupTracker(name=u'testgroup2', description=u'Test desc2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group3(request): +tracker = GroupTracker(name=u'testgroup3', description=u'Test desc3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group4(request): +tracker = GroupTracker(name=u'testgroup4', description=u'Test desc4') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def host1(request): +tracker = HostTracker(name=u'host1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def hostgroup1(request): +tracker = HostGroupTracker(name=u'hostgroup1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def hostgroup2(request): +tracker = HostGroupTracker(name=u'hostgroup2') +return trac
Re: [Freeipa-devel] [PATCH 0005] Refactor test_nesting, create HostGroupTracker
On 01/15/2016 03:37 PM, Filip Skola wrote: Hi, sending rebased patch. F. - Original Message - Hi, the patch no longer applies to master. Please rebase it. Thanks, Milan - Original Message - From: "Filip Skola" To: freeipa-devel@redhat.com Cc: "Milan Kubík" , "Aleš Mareček" Sent: Tuesday, 22 December, 2015 11:56:15 AM Subject: [PATCH 0005] Refactor test_nesting, create HostGroupTracker Hi, another patch from refactoring-test_xmlrpc series. Filip NACK, something seems to be missing in the patch * Module ipatests.test_xmlrpc.tracker.hostgroup_plugin ipatests/test_xmlrpc/tracker/hostgroup_plugin.py:222: [E1101(no-member), HostGroupTracker.check_add_member_negative] Instance of 'HostGroupTracker' has no 'adds' member) -- Milan Kubik -- 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 0005] Refactor test_nesting, create HostGroupTracker
Hi, sending rebased patch. F. - Original Message - > Hi, > > the patch no longer applies to master. Please rebase it. > > Thanks, > Milan > > - Original Message - > From: "Filip Skola" > To: freeipa-devel@redhat.com > Cc: "Milan Kubík" , "Aleš Mareček" > Sent: Tuesday, 22 December, 2015 11:56:15 AM > Subject: [PATCH 0005] Refactor test_nesting, create HostGroupTracker > > Hi, > > another patch from refactoring-test_xmlrpc series. > > Filip > From 85950890a8eb97ec2d138fa9b9b2c24cc2b3d408 Mon Sep 17 00:00:00 2001 From: Filip Skola Date: Fri, 15 Jan 2016 15:08:46 +0100 Subject: [PATCH] Refactor test_nesting, create HostGroupTracker --- ipatests/test_xmlrpc/test_nesting.py | 776 - ipatests/test_xmlrpc/tracker/group_plugin.py | 4 +- ipatests/test_xmlrpc/tracker/host_plugin.py| 1 + .../{group_plugin.py => hostgroup_plugin.py} | 218 +++--- 4 files changed, 257 insertions(+), 742 deletions(-) copy ipatests/test_xmlrpc/tracker/{group_plugin.py => hostgroup_plugin.py} (53%) diff --git a/ipatests/test_xmlrpc/test_nesting.py b/ipatests/test_xmlrpc/test_nesting.py index c3bf1ce84e0bef412c44ed847e7e0fc4648a4b74..f78a6e54bd7a94cb9d2645f5bdc5d5c109a79b1f 100644 --- a/ipatests/test_xmlrpc/test_nesting.py +++ b/ipatests/test_xmlrpc/test_nesting.py @@ -20,193 +20,93 @@ Test group nesting and indirect members """ -from ipalib import api -from ipatests.test_xmlrpc import objectclasses -from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits, - fuzzy_uuid) -from ipapython.dn import DN -from ipatests.test_xmlrpc.test_user_plugin import get_user_result +from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test +from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker +from ipatests.test_xmlrpc.tracker.group_plugin import GroupTracker +from ipatests.test_xmlrpc.tracker.host_plugin import HostTracker +from ipatests.test_xmlrpc.tracker.hostgroup_plugin import HostGroupTracker import pytest -group1 = u'testgroup1' -group2 = u'testgroup2' -group3 = u'testgroup3' -group4 = u'testgroup4' -user1 = u'tuser1' -user2 = u'tuser2' -user3 = u'tuser3' -user4 = u'tuser4' - -hostgroup1 = u'testhostgroup1' -hgdn1 = DN(('cn',hostgroup1),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) -hostgroup2 = u'testhostgroup2' -hgdn2 = DN(('cn',hostgroup2),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) - -fqdn1 = u'testhost1.%s' % api.env.domain -host_dn1 = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'), - api.env.basedn) + +@pytest.fixture(scope='class') +def user1(request): +tracker = UserTracker(name=u'tuser1', givenname=u'Test1', sn=u'User1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user2(request): +tracker = UserTracker(name=u'tuser2', givenname=u'Test2', sn=u'User2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user3(request): +tracker = UserTracker(name=u'tuser3', givenname=u'Test3', sn=u'User3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user4(request): +tracker = UserTracker(name=u'tuser4', givenname=u'Test4', sn=u'User4') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group1(request): +tracker = GroupTracker(name=u'testgroup1', description=u'Test desc1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group2(request): +tracker = GroupTracker(name=u'testgroup2', description=u'Test desc2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group3(request): +tracker = GroupTracker(name=u'testgroup3', description=u'Test desc3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group4(request): +tracker = GroupTracker(name=u'testgroup4', description=u'Test desc4') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def host1(request): +tracker = HostTracker(name=u'host1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def hostgroup1(request): +tracker = HostGroupTracker(name=u'hostgroup1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def hostgroup2(request): +tracker = HostGroupTracker(name=u'hostgroup2') +return tracker.make_fixture(request) @pytest.mark.tier1 -class test_nesting(Declarative): -cleanup_commands = [ -('group_del', [group1], {}), -('group_del', [group2], {}), -('group_del', [group3], {}), -('group_del', [group4], {}), -('user_del', [user1], {}), -('user_del', [user2], {}), -('user_del', [user3], {}), -('user_del', [user4], {}), -('host_del', [fqdn1], {}), -('hostgroup_del', [hostgroup1], {}), -('hostgroup_del', [hostgroup2], {}),
Re: [Freeipa-devel] [PATCH 0005] Refactor test_nesting, create HostGroupTracker
Hi, the patch no longer applies to master. Please rebase it. Thanks, Milan - Original Message - From: "Filip Skola" To: freeipa-devel@redhat.com Cc: "Milan Kubík" , "Aleš Mareček" Sent: Tuesday, 22 December, 2015 11:56:15 AM Subject: [PATCH 0005] Refactor test_nesting, create HostGroupTracker Hi, another patch from refactoring-test_xmlrpc series. 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
[Freeipa-devel] [PATCH 0005] Refactor test_nesting, create HostGroupTracker
Hi, another patch from refactoring-test_xmlrpc series. Filip From f2611f7d364657c0cf425d93b8a7262847e8b715 Mon Sep 17 00:00:00 2001 From: Filip Skola Date: Tue, 22 Dec 2015 11:33:32 +0100 Subject: [PATCH] Refactor test_nesting, create HostGroupTracker --- ipatests/test_xmlrpc/test_nesting.py | 776 - ipatests/test_xmlrpc/tracker/group_plugin.py | 4 +- ipatests/test_xmlrpc/tracker/host_plugin.py| 1 + .../{group_plugin.py => hostgroup_plugin.py} | 222 +++--- 4 files changed, 255 insertions(+), 748 deletions(-) copy ipatests/test_xmlrpc/tracker/{group_plugin.py => hostgroup_plugin.py} (52%) diff --git a/ipatests/test_xmlrpc/test_nesting.py b/ipatests/test_xmlrpc/test_nesting.py index c3bf1ce84e0bef412c44ed847e7e0fc4648a4b74..f78a6e54bd7a94cb9d2645f5bdc5d5c109a79b1f 100644 --- a/ipatests/test_xmlrpc/test_nesting.py +++ b/ipatests/test_xmlrpc/test_nesting.py @@ -20,193 +20,93 @@ Test group nesting and indirect members """ -from ipalib import api -from ipatests.test_xmlrpc import objectclasses -from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits, - fuzzy_uuid) -from ipapython.dn import DN -from ipatests.test_xmlrpc.test_user_plugin import get_user_result +from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test +from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker +from ipatests.test_xmlrpc.tracker.group_plugin import GroupTracker +from ipatests.test_xmlrpc.tracker.host_plugin import HostTracker +from ipatests.test_xmlrpc.tracker.hostgroup_plugin import HostGroupTracker import pytest -group1 = u'testgroup1' -group2 = u'testgroup2' -group3 = u'testgroup3' -group4 = u'testgroup4' -user1 = u'tuser1' -user2 = u'tuser2' -user3 = u'tuser3' -user4 = u'tuser4' - -hostgroup1 = u'testhostgroup1' -hgdn1 = DN(('cn',hostgroup1),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) -hostgroup2 = u'testhostgroup2' -hgdn2 = DN(('cn',hostgroup2),('cn','hostgroups'),('cn','accounts'), - api.env.basedn) - -fqdn1 = u'testhost1.%s' % api.env.domain -host_dn1 = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'), - api.env.basedn) + +@pytest.fixture(scope='class') +def user1(request): +tracker = UserTracker(name=u'tuser1', givenname=u'Test1', sn=u'User1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user2(request): +tracker = UserTracker(name=u'tuser2', givenname=u'Test2', sn=u'User2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user3(request): +tracker = UserTracker(name=u'tuser3', givenname=u'Test3', sn=u'User3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def user4(request): +tracker = UserTracker(name=u'tuser4', givenname=u'Test4', sn=u'User4') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group1(request): +tracker = GroupTracker(name=u'testgroup1', description=u'Test desc1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group2(request): +tracker = GroupTracker(name=u'testgroup2', description=u'Test desc2') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group3(request): +tracker = GroupTracker(name=u'testgroup3', description=u'Test desc3') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def group4(request): +tracker = GroupTracker(name=u'testgroup4', description=u'Test desc4') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def host1(request): +tracker = HostTracker(name=u'host1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def hostgroup1(request): +tracker = HostGroupTracker(name=u'hostgroup1') +return tracker.make_fixture(request) + + +@pytest.fixture(scope='class') +def hostgroup2(request): +tracker = HostGroupTracker(name=u'hostgroup2') +return tracker.make_fixture(request) @pytest.mark.tier1 -class test_nesting(Declarative): -cleanup_commands = [ -('group_del', [group1], {}), -('group_del', [group2], {}), -('group_del', [group3], {}), -('group_del', [group4], {}), -('user_del', [user1], {}), -('user_del', [user2], {}), -('user_del', [user3], {}), -('user_del', [user4], {}), -('host_del', [fqdn1], {}), -('hostgroup_del', [hostgroup1], {}), -('hostgroup_del', [hostgroup2], {}), -] - -tests = [ - - -# create group1: - -dict( -desc='Create %r' % group1, -command=( -'group_add', [group1], dict(description=u'Test desc 1') -), -expected=dict( -value=group1, -summary=u'Added group "testgroup1"', -result=dict( -