2 files changed, 38 insertions, 5 deletions
diff --git a/src/leap/eip/tests/test_eipconnection.py b/src/leap/eip/tests/test_eipconnection.py
index 4ee5ae30..163f8d45 100644
--- a/src/leap/eip/tests/test_eipconnection.py
+++ b/src/leap/eip/tests/test_eipconnection.py
@@ -1,6 +1,8 @@
+import glob
 import logging
 import platform
-import os
+#import os
+import shutil
 
 logging.basicConfig()
 logger = logging.getLogger(name=__name__)
@@ -66,11 +68,26 @@ class EIPConductorTest(BaseLeapTest):
         self.manager = Mock(name="openvpnmanager_mock")
         self.con = MockedEIPConnection()
         self.con.provider = self.provider
+
+        # XXX watch out. This sometimes is throwing the following error:
+        # NoSuchProcess: process no longer exists (pid=6571)
+        # because of a bad implementation of _check_if_running_instance
+
         self.con.run_openvpn_checks()
 
     def tearDown(self):
+        pass
+
+    def doCleanups(self):
+        super(BaseLeapTest, self).doCleanups()
+        self.cleanupSocketDir()
         del self.con
 
+    def cleanupSocketDir(self):
+        ptt = ('/tmp/leap-tmp*')
+        for tmpdir in glob.glob(ptt):
+            shutil.rmtree(tmpdir)
+
     #
     # tests
     #
@@ -81,6 +98,7 @@ class EIPConductorTest(BaseLeapTest):
         """
         con = self.con
         self.assertEqual(con.autostart, True)
+        # XXX moar!
 
     def test_ovpn_command(self):
         """
@@ -98,6 +116,7 @@ class EIPConductorTest(BaseLeapTest):
         # needed to run tests. (roughly 3 secs for this only)
         # We should modularize and inject Mocks on more places.
 
+        oldcon = self.con
         del(self.con)
         config_checker = Mock()
         self.con = MockedEIPConnection(config_checker=config_checker)
@@ -107,6 +126,7 @@ class EIPConductorTest(BaseLeapTest):
             skip_download=False)
 
         # XXX test for cert_checker also
+        self.con = oldcon
 
     # connect/disconnect calls
 
diff --git a/src/leap/eip/tests/test_openvpnconnection.py b/src/leap/eip/tests/test_openvpnconnection.py
index 0f27facf..f7493567 100644
--- a/src/leap/eip/tests/test_openvpnconnection.py
+++ b/src/leap/eip/tests/test_openvpnconnection.py
@@ -58,16 +58,27 @@ class OpenVPNConnectionTest(BaseLeapTest):
     def setUp(self):
         # XXX this will have to change for win, host=localhost
         host = eipconfig.get_socket_path()
+        self.host = host
         self.manager = MockedOpenVPNConnection(host=host)
 
     def tearDown(self):
+        pass
+
+    def doCleanups(self):
+        super(BaseLeapTest, self).doCleanups()
+        self.cleanupSocketDir()
+
+    def cleanupSocketDir(self):
         # remove the socket folder.
         # XXX only if posix. in win, host is localhost, so nothing
         # has to be done.
-        if self.manager.host:
-            folder, fpath = os.path.split(self.manager.host)
-            assert folder.startswith('/tmp/leap-tmp')  # safety check
-            shutil.rmtree(folder)
+        if self.host:
+            folder, fpath = os.path.split(self.host)
+            try:
+                assert folder.startswith('/tmp/leap-tmp')  # safety check
+                shutil.rmtree(folder)
+            except:
+                self.fail("could not remove temp file")
 
         del self.manager
 
@@ -108,12 +119,14 @@ class OpenVPNConnectionTest(BaseLeapTest):
         self.assertEqual(self.manager.port, 7777)
 
     def test_port_types_init(self):
+        oldmanager = self.manager
         self.manager = MockedOpenVPNConnection(port="42")
         self.assertEqual(self.manager.port, 42)
         self.manager = MockedOpenVPNConnection()
         self.assertEqual(self.manager.port, "unix")
         self.manager = MockedOpenVPNConnection(port="bad")
         self.assertEqual(self.manager.port, None)
+        self.manager = oldmanager
 
     def test_uds_telnet_called_on_connect(self):
         self.manager.connect_to_management()