[testfix] Add steps to stabilise content in glusterd - part2

and used wait for peer to connect and
wait for glusterd to connect functions in testcases
added fixes to  check file exists
increased timeout value for failure cases

Change-Id: I9d5692f635ed324ffe7dac9944ec9b8f3b933fd1
Signed-off-by: Sri Vignesh <sselvan@redhat.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/tests/functional/glusterd/test_glusterd_snap_info_on_detached_node.py b/tests/functional/glusterd/test_glusterd_snap_info_on_detached_node.py
index 95aa68739..7eeb5f93d 100644
--- a/tests/functional/glusterd/test_glusterd_snap_info_on_detached_node.py
+++ b/tests/functional/glusterd/test_glusterd_snap_info_on_detached_node.py
@@ -17,6 +17,7 @@ import random
 from glusto.core import Glusto as g
 from glustolibs.gluster.exceptions import ExecutionError
 from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on
+from glustolibs.gluster.glusterfile import file_exists
 from glustolibs.gluster.lib_utils import form_bricks_list
 from glustolibs.gluster.volume_ops import (volume_create,
                                            set_volume_options, volume_start)
@@ -105,12 +106,10 @@ class TestSnapInfoOnPeerDetachedNode(GlusterBaseClass):
         # Validate files /var/lib/glusterd/snaps on all the servers is same
         self.pathname = "/var/lib/glusterd/snaps/%s" % self.snapname
         for server in self.servers:
-            conn = g.rpyc_get_connection(server)
-            ret = conn.modules.os.path.isdir(self.pathname)
+            ret = file_exists(server, self.pathname)
             self.assertTrue(ret, "%s directory doesn't exist on node %s" %
                             (self.pathname, server))
             g.log.info("%s path exists on node %s", self.pathname, server)
-        g.rpyc_close_deployed_servers()
 
         # Peer detach one node
         self.random_node_peer_detach = random.choice(self.servers[1:])
@@ -121,11 +120,10 @@ class TestSnapInfoOnPeerDetachedNode(GlusterBaseClass):
         g.log.info("Peer detach succeeded")
 
         # /var/lib/glusterd/snaps/<snapname> directory should not present
-        conn = g.rpyc_get_connection(self.random_node_peer_detach)
-        ret = conn.modules.os.path.isdir(self.pathname)
+
+        ret = file_exists(self.random_node_peer_detach, self.pathname)
         self.assertFalse(ret, "%s directory should not exist on the peer"
                               "which is detached from cluster%s" % (
                                   self.pathname, self.random_node_peer_detach))
         g.log.info("Expected: %s path doesn't exist on peer detached node %s",
                    self.pathname, self.random_node_peer_detach)
-        g.rpyc_close_deployed_servers()