Merge pull request #3082 from FarooqAbdulla02/socket_issues

Fix: Safely quit remote session by checking remotehost_public attribute

Author: Naresh-ibm

io/net/iperf_test.py

@@ -259,5 +259,6 @@ def tearDown(self):
             if self.hbond:
                 self.networkinterface.restore_slave_cfg_file()
             self.remotehost.remote_session.quit()
-            self.remotehost_public.remote_session.quit()
+            if hasattr(self, 'remotehost_public'):
+                self.remotehost_public.remote_session.quit()
             self.session.quit()

io/net/multiport_stress.py

@@ -149,4 +149,5 @@ def tearDown(self):
                     self.log.info(
                         "backup file not available, could not restore file.")
                 self.remotehost.remote_session.quit()
-                self.remotehost_public.remote_session.quit()
+                if hasattr(self, 'remotehost_public'):
+                    self.remotehost_public.remote_session.quit()

io/net/netperf_test.py

@@ -221,5 +221,6 @@ def tearDown(self):
             except Exception:
                 self.log.info("backup file not available, could not restore file.")
             self.remotehost.remote_session.quit()
-            self.remotehost_public.remote_session.quit()
+            if hasattr(self, 'remotehost_public'):
+                self.remotehost_public.remote_session.quit()
             self.session.quit()

io/net/network_test.py

@@ -346,6 +346,7 @@ def tearDown(self):
                 self.log.info(
                     "backup file not available, could not restore file.")
         self.remotehost.remote_session.quit()
-        self.remotehost_public.remote_session.quit()
+        if hasattr(self, 'remotehost_public'):
+            self.remotehost_public.remote_session.quit()
         if 'scp' or 'ssh' in str(self.name.name):
             self.session.quit()

io/net/tcpdump.py

@@ -192,4 +192,5 @@ def tearDown(self):
                 self.log.info(
                     "backup file not available, could not restore file.")
             self.remotehost.remote_session.quit()
-            self.remotehost_public.remote_session.quit()
+            if hasattr(self, 'remotehost_public'):
+                self.remotehost_public.remote_session.quit()

io/net/uperf_test.py

@@ -221,5 +221,6 @@ def tearDown(self):
                 self.log.info(
                     "backup file not available, could not restore file.")
             self.remotehost.remote_session.quit()
-            self.remotehost_public.remote_session.quit()
+            if hasattr(self, 'remotehost_public'):
+                self.remotehost_public.remote_session.quit()
             self.session.quit()