From: Mukund Sivaraman <muks@isc.org>
Date: Fri, 9 Nov 2012 05:11:38 +0000 (+0530)
Subject: [2353] Test that the socket and tmpdir are deleted
X-Git-Tag: bind10-1.0.0-beta-release~19^2~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83d4f414a296dfc757a7a4f6e8c8fcf7bd24ca2e;p=thirdparty%2Fkea.git

[2353] Test that the socket and tmpdir are deleted
---

diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index 4c73b78b90..8807393d76 100755
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -914,11 +914,10 @@ class BoB:
         """
         if self._srv_socket is not None:
             self._srv_socket.close()
-            os.remove(self._socket_path)
-            os.rmdir(self._tmpdir)
-            self._srv_socket = None
-            self._tmpdir = None
-            self._socket_path = None
+            if os.path.exists(self._socket_path):
+                os.remove(self._socket_path)
+            if os.path.isdir(self._tmpdir):
+                os.rmdir(self._tmpdir)
 
     def _srv_accept(self):
         """
diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index 82d96d226d..5f705d6d32 100644
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -378,6 +378,7 @@ class TestBoB(unittest.TestCase):
         bob.init_socket_srv()
 
         self.assertIsNotNone(bob._srv_socket)
+        self.assertNotEqual(-1, bob._srv_socket.fileno())
         self.assertIsNotNone(bob._tmpdir)
         self.assertTrue(os.path.isdir(bob._tmpdir))
         self.assertIsNotNone(bob._socket_path)
@@ -385,9 +386,9 @@ class TestBoB(unittest.TestCase):
 
         bob.remove_socket_srv()
 
-        self.assertIsNone(bob._srv_socket)
-        self.assertIsNone(bob._tmpdir)
-        self.assertIsNone(bob._socket_path)
+        self.assertEqual(-1, bob._srv_socket.fileno())
+        self.assertFalse(os.path.exists(bob._socket_path))
+        self.assertFalse(os.path.isdir(bob._tmpdir))
 
     def test_init_alternate_socket(self):
         bob = BoB("alt_socket_file")