[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 4c73b78b909f3e4ac1a2a9b8bcf24c3940992099..8807393d762cadc623c8f0e1b3f11d7a5503c3d4 100755 (executable)
--- 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 82d96d226d10e250f771dc6940194a4a6db9b3e3..5f705d6d32a2e15c30843c58ae035099dc030d4a 100644 (file)
--- 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")