[Freeipa-devel] [PATCH 0155] ipatests: Kill winbindd process after uninstall

[Alexander Bokovoy]

On Tue, 25 Feb 2014, Tomas Babej wrote:
>Hi,
>
>As a part of a better cleanup procedure in the integration tests,
>make sure that winbindd is not running after uninstalling the IPA
>server.
Better patch 0140  attached. We simply need to stop and disable winbind in
adtrustinstance.uninstall()

-- 
/ Alexander Bokovoy
-------------- next part --------------
>From 01c230ddcc3b70ddc147c1b46e766e5cab93c380 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy at redhat.com>
Date: Tue, 25 Feb 2014 20:11:50 +0200
Subject: [PATCH 3/3] adtrustinstance: make sure to stop and disable winbind in
 uninstall()

This makes unnecessary Tomas' patch 0155.
---
 ipaserver/install/adtrustinstance.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index 621e3fd..6e30d5a 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -889,11 +889,14 @@ class ADTRUSTInstance(service.Service):
         self.restore_state("running")
         self.restore_state("enabled")
 
+        winbind = ipaservices.service("winbind")
         # Always try to stop and disable smb service, since we do not leave
         # working configuration after uninstall
         try:
             self.stop()
             self.disable()
+            winbind.stop()
+            winbind.disable()
         except:
             pass
 
-- 
1.8.3.1