URL: https://github.com/freeipa/freeipa/pull/99 Author: mirielka Title: #99: Tests: Remove --force options from tracker base class Action: opened
PR body: """ Removing --force option from tracker base class so it would not be required to be implemented in every specific tracker, even though it's not necessary. Modifying existing trackers to reflect this change. https://fedorahosted.org/freeipa/ticket/6124 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/99/head:pr99 git checkout pr99
From 89408696a956425f844b720d00ef6d2ba002c921 Mon Sep 17 00:00:00 2001 From: Lenka Doudova <ldoud...@redhat.com> Date: Tue, 20 Sep 2016 17:29:02 +0200 Subject: [PATCH] Tests: Remove --force options from tracker base class Removing --force option from tracker base class so it would not be required to be implemented in every specific tracker, even though it's not necessary. Modifying existing trackers to reflect this change. https://fedorahosted.org/freeipa/ticket/6124 --- ipatests/test_xmlrpc/test_certprofile_plugin.py | 2 +- ipatests/test_xmlrpc/tracker/automember_plugin.py | 3 +-- ipatests/test_xmlrpc/tracker/base.py | 8 ++++---- ipatests/test_xmlrpc/tracker/ca_plugin.py | 2 +- ipatests/test_xmlrpc/tracker/caacl_plugin.py | 2 +- ipatests/test_xmlrpc/tracker/certprofile_plugin.py | 2 +- ipatests/test_xmlrpc/tracker/group_plugin.py | 2 +- ipatests/test_xmlrpc/tracker/host_plugin.py | 8 ++++++++ ipatests/test_xmlrpc/tracker/location_plugin.py | 4 ++-- ipatests/test_xmlrpc/tracker/service_plugin.py | 8 ++++++++ ipatests/test_xmlrpc/tracker/stageuser_plugin.py | 2 +- ipatests/test_xmlrpc/tracker/sudocmd_plugin.py | 2 +- ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py | 3 +-- ipatests/test_xmlrpc/tracker/user_plugin.py | 2 +- 14 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ipatests/test_xmlrpc/test_certprofile_plugin.py b/ipatests/test_xmlrpc/test_certprofile_plugin.py index e845977..1b3edda 100644 --- a/ipatests/test_xmlrpc/test_certprofile_plugin.py +++ b/ipatests/test_xmlrpc/test_certprofile_plugin.py @@ -128,7 +128,7 @@ class TestProfileCRUD(XMLRPC_test): def test_create_duplicate(self, user_profile): msg = u'Certificate Profile with name "{}" already exists' user_profile.ensure_exists() - command = user_profile.make_create_command(force=True) + command = user_profile.make_create_command() with raises_exact(errors.DuplicateEntry( message=msg.format(user_profile.name))): command() diff --git a/ipatests/test_xmlrpc/tracker/automember_plugin.py b/ipatests/test_xmlrpc/tracker/automember_plugin.py index 08b17b0..61f87c3 100644 --- a/ipatests/test_xmlrpc/tracker/automember_plugin.py +++ b/ipatests/test_xmlrpc/tracker/automember_plugin.py @@ -38,8 +38,7 @@ def __init__(self, groupname, membertype, description=u'Automember desc'): self.dn = DN(('cn', self.cn), ('cn', self.membertype.title()), ('cn', 'automember'), ('cn', 'etc'), api.env.basedn) - def make_create_command(self, - force=True, *args, **kwargs): + def make_create_command(self, *args, **kwargs): """ Make function that creates an automember using 'automember-add' """ return self.make_command('automember_add', self.cn, description=self.description, diff --git a/ipatests/test_xmlrpc/tracker/base.py b/ipatests/test_xmlrpc/tracker/base.py index f7fc55d..0596448 100644 --- a/ipatests/test_xmlrpc/tracker/base.py +++ b/ipatests/test_xmlrpc/tracker/base.py @@ -167,7 +167,7 @@ def ensure_exists(self): """If the entry does not exist (according to tracker state), create it """ if not self.exists: - self.create(force=True) + self.create() def ensure_missing(self): """If the entry exists (according to tracker state), delete it @@ -175,7 +175,7 @@ def ensure_missing(self): if self.exists: self.delete() - def make_create_command(self, force=True): + def make_create_command(self): """Make function that creates the plugin entry object.""" raise NotImplementedError(self._override_me_msg) @@ -199,11 +199,11 @@ def make_update_command(self, updates): """Make function that modifies the entry using ${CMD}_mod""" raise NotImplementedError(self._override_me_msg) - def create(self, force=True): + def create(self): """Helper function to create an entry and check the result""" self.ensure_missing() self.track_create() - command = self.make_create_command(force=force) + command = self.make_create_command() result = command() self.check_create(result) diff --git a/ipatests/test_xmlrpc/tracker/ca_plugin.py b/ipatests/test_xmlrpc/tracker/ca_plugin.py index 7586c77..ec58c28 100644 --- a/ipatests/test_xmlrpc/tracker/ca_plugin.py +++ b/ipatests/test_xmlrpc/tracker/ca_plugin.py @@ -37,7 +37,7 @@ def __init__(self, name, subject, desc=u"Test generated CA", self.api.env.container_ca, self.api.env.basedn) - def make_create_command(self, force=True): + def make_create_command(self): """Make function that creates the plugin entry object.""" return self.make_command( 'ca_add', self.name, ipacasubjectdn=self.ipasubjectdn, diff --git a/ipatests/test_xmlrpc/tracker/caacl_plugin.py b/ipatests/test_xmlrpc/tracker/caacl_plugin.py index 79c892d..d2c5b02 100644 --- a/ipatests/test_xmlrpc/tracker/caacl_plugin.py +++ b/ipatests/test_xmlrpc/tracker/caacl_plugin.py @@ -87,7 +87,7 @@ def create_categories(self): """ return {cat: [v] for cat, v in self.categories.items() if v} - def make_create_command(self, force=True): + def make_create_command(self): return self.make_command(u'caacl_add', self.name, description=self.description, **self.categories) diff --git a/ipatests/test_xmlrpc/tracker/certprofile_plugin.py b/ipatests/test_xmlrpc/tracker/certprofile_plugin.py index 21c96c5..d9aa302 100644 --- a/ipatests/test_xmlrpc/tracker/certprofile_plugin.py +++ b/ipatests/test_xmlrpc/tracker/certprofile_plugin.py @@ -57,7 +57,7 @@ def profile(self): content = f.read() return unicode(content) - def make_create_command(self, force=True): + def make_create_command(self): if not self.profile: raise RuntimeError('Tracker object without path to profile ' 'cannot be used to create profile entry.') diff --git a/ipatests/test_xmlrpc/tracker/group_plugin.py b/ipatests/test_xmlrpc/tracker/group_plugin.py index b46f9f9..94a4cdc 100644 --- a/ipatests/test_xmlrpc/tracker/group_plugin.py +++ b/ipatests/test_xmlrpc/tracker/group_plugin.py @@ -30,7 +30,7 @@ def __init__(self, name, description=u'Group desc'): self.dn = get_group_dn(self.cn) def make_create_command(self, nonposix=False, external=False, - force=True, *args, **kwargs): + *args, **kwargs): """ Make function that creates a group using 'group-add' """ return self.make_command('group_add', self.cn, description=self.description, diff --git a/ipatests/test_xmlrpc/tracker/host_plugin.py b/ipatests/test_xmlrpc/tracker/host_plugin.py index 7561906..5c2b4ee 100644 --- a/ipatests/test_xmlrpc/tracker/host_plugin.py +++ b/ipatests/test_xmlrpc/tracker/host_plugin.py @@ -93,6 +93,14 @@ def make_update_command(self, updates): """Make function that modifies the host using host_mod""" return self.make_command('host_mod', self.fqdn, **updates) + def create(self, force=True): + """Helper function to create an entry and check the result""" + self.ensure_missing() + self.track_create() + command = self.make_create_command(force=force) + result = command() + self.check_create(result) + def track_create(self): """Update expected state for host creation""" self.attrs = dict( diff --git a/ipatests/test_xmlrpc/tracker/location_plugin.py b/ipatests/test_xmlrpc/tracker/location_plugin.py index 92ccf87..23adbc1 100644 --- a/ipatests/test_xmlrpc/tracker/location_plugin.py +++ b/ipatests/test_xmlrpc/tracker/location_plugin.py @@ -43,13 +43,13 @@ def __init__(self, name, description=u"Location description"): self.servers = {} - def make_create_command(self, force=None): + def make_create_command(self): """Make function that creates this location using location-add""" return self.make_command( 'location_add', self.idnsname, description=self.description, ) - def make_delete_command(self, force=None): + def make_delete_command(self): """Make function that removes this location using location-del""" return self.make_command('location_del', self.idnsname) diff --git a/ipatests/test_xmlrpc/tracker/service_plugin.py b/ipatests/test_xmlrpc/tracker/service_plugin.py index fe34390..a0bb884 100644 --- a/ipatests/test_xmlrpc/tracker/service_plugin.py +++ b/ipatests/test_xmlrpc/tracker/service_plugin.py @@ -85,6 +85,14 @@ def make_update_command(self, updates): return self.make_command('service_mod', self.name, **updates) + def create(self, force=True): + """Helper function to create an entry and check the result""" + self.ensure_missing() + self.track_create() + command = self.make_create_command(force=force) + result = command() + self.check_create(result) + def track_create(self, **options): """ Update expected state for service creation """ self.attrs = { diff --git a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py index 9bcb106..82d7e06 100644 --- a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py +++ b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py @@ -71,7 +71,7 @@ def __init__(self, name, givenname, sn, **kwargs): self.kwargs = kwargs - def make_create_command(self, options=None, force=None): + def make_create_command(self, options=None): """ Make function that creates a staged user using stageuser-add """ if options is not None: self.kwargs = options diff --git a/ipatests/test_xmlrpc/tracker/sudocmd_plugin.py b/ipatests/test_xmlrpc/tracker/sudocmd_plugin.py index 003d39a..2c1aee5 100644 --- a/ipatests/test_xmlrpc/tracker/sudocmd_plugin.py +++ b/ipatests/test_xmlrpc/tracker/sudocmd_plugin.py @@ -32,7 +32,7 @@ def name(self): """ Property holding the name of the entry in LDAP """ return self.cmd - def make_create_command(self, force=True): + def make_create_command(self): """ Make function that creates a sudocmd using 'sudocmd-add' """ return self.make_command('sudocmd_add', self.cmd, description=self.description) diff --git a/ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py index 2b354ef..f744054 100644 --- a/ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py +++ b/ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py @@ -36,8 +36,7 @@ def __init__(self, name, description=u'SudoCmdGroup desc'): self.dn = DN(('cn', self.cn), ('cn', 'sudocmdgroups'), ('cn', 'sudo'), api.env.basedn) - def make_create_command(self, - force=True, *args, **kwargs): + def make_create_command(self, *args, **kwargs): """ Make function that creates a sudocmdgroup using 'sudocmdgroup-add' """ return self.make_command('sudocmdgroup_add', self.cn, diff --git a/ipatests/test_xmlrpc/tracker/user_plugin.py b/ipatests/test_xmlrpc/tracker/user_plugin.py index ae3d39c..b55deb9 100644 --- a/ipatests/test_xmlrpc/tracker/user_plugin.py +++ b/ipatests/test_xmlrpc/tracker/user_plugin.py @@ -71,7 +71,7 @@ def __init__(self, name, givenname, sn, **kwargs): self.kwargs = kwargs - def make_create_command(self, force=None): + def make_create_command(self): """ Make function that crates a user using user-add """ return self.make_command( 'user_add', self.uid,
-- 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
