URL: https://github.com/freeipa/freeipa/pull/123 Author: mirielka Title: #123: Tests: Remove silent deleting and creating entries by tracker Action: opened
PR body: """ https://fedorahosted.org/freeipa/ticket/6123 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/123/head:pr123 git checkout pr123
From 6fd6fcfc282675014e2a4704d4211a2f8e18d8c9 Mon Sep 17 00:00:00 2001 From: Lenka Doudova <ldoud...@redhat.com> Date: Tue, 27 Sep 2016 14:46:32 +0200 Subject: [PATCH] Tests: Remove silent deleting and creating entries by tracker https://fedorahosted.org/freeipa/ticket/6123 --- ipatests/test_xmlrpc/test_group_plugin.py | 4 ++-- ipatests/test_xmlrpc/test_stageuser_plugin.py | 1 + ipatests/test_xmlrpc/test_user_plugin.py | 2 ++ ipatests/test_xmlrpc/tracker/base.py | 5 ----- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ipatests/test_xmlrpc/test_group_plugin.py b/ipatests/test_xmlrpc/test_group_plugin.py index 27a8a33..2f824de 100644 --- a/ipatests/test_xmlrpc/test_group_plugin.py +++ b/ipatests/test_xmlrpc/test_group_plugin.py @@ -231,7 +231,7 @@ def test_search_for_all_groups_with_members(self, group, group2): def test_search_for_all_groups(self, group, group2): """ Search for all groups """ group.ensure_exists() - group2.create() + group2.ensure_exists() command = group.make_command('group_find') result = command() assert_deepequal(dict( @@ -631,7 +631,7 @@ class TestManagedGroupObjectclasses(XMLRPC_test): def test_check_objectclasses_after_detach(self, user, managed_group): """ Check objectclasses after user was detached from managed group """ # https://fedorahosted.org/freeipa/ticket/4909#comment:1 - user.create() + user.ensure_exists() user.run_command('group_detach', *[user.uid]) managed_group.retrieve(all=True) managed_group.add_member(dict(user=user.uid)) diff --git a/ipatests/test_xmlrpc/test_stageuser_plugin.py b/ipatests/test_xmlrpc/test_stageuser_plugin.py index 34cfaf8..4a859e8 100644 --- a/ipatests/test_xmlrpc/test_stageuser_plugin.py +++ b/ipatests/test_xmlrpc/test_stageuser_plugin.py @@ -255,6 +255,7 @@ def test_delete_stageduser(self, stageduser): stageduser.delete() def test_find_stageduser(self, stageduser): + stageduser.ensure_exists() stageduser.find() def test_findall_stageduser(self, stageduser): diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py index 7c27abc..7508578 100644 --- a/ipatests/test_xmlrpc/test_user_plugin.py +++ b/ipatests/test_xmlrpc/test_user_plugin.py @@ -177,6 +177,7 @@ def test_rename_nonexistent(self, user, renameduser): class TestUser(XMLRPC_test): def test_retrieve(self, user): """ Create user and try to retrieve it """ + user.ensure_exists() user.retrieve() def test_delete(self, user): @@ -216,6 +217,7 @@ def test_remove_userclass(self, user): class TestFind(XMLRPC_test): def test_find(self, user): """ Basic check of user-find """ + user.ensure_exists() user.find() def test_find_with_all(self, user): diff --git a/ipatests/test_xmlrpc/tracker/base.py b/ipatests/test_xmlrpc/tracker/base.py index ecaadc6..a2b7406 100644 --- a/ipatests/test_xmlrpc/tracker/base.py +++ b/ipatests/test_xmlrpc/tracker/base.py @@ -199,7 +199,6 @@ def make_update_command(self, updates): def create(self): """Helper function to create an entry and check the result""" - self.ensure_missing() self.track_create() command = self.make_create_command() result = command() @@ -227,7 +226,6 @@ def check_create(self, result): def delete(self): """Helper function to delete a host and check the result""" - self.ensure_exists() self.track_delete() command = self.make_delete_command() result = command() @@ -244,7 +242,6 @@ def check_delete(self, result): def retrieve(self, all=False, raw=False): """Helper function to retrieve an entry and check the result""" - self.ensure_exists() command = self.make_retrieve_command(all=all, raw=raw) result = command() self.check_retrieve(result, all=all, raw=raw) @@ -255,7 +252,6 @@ def check_retrieve(self, result, all=False, raw=False): def find(self, all=False, raw=False): """Helper function to search for this hosts and check the result""" - self.ensure_exists() command = self.make_find_command(self.name, all=all, raw=raw) result = command() self.check_find(result, all=all, raw=raw) @@ -274,7 +270,6 @@ def update(self, updates, expected_updates=None): if expected_updates is None: expected_updates = {} - self.ensure_exists() command = self.make_update_command(updates) result = command() self.attrs.update(updates)
-- 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
