1 files changed, 15 insertions, 1 deletions
diff --git a/tests/include.rc b/tests/include.rc
index a1713880d84..5d209d61075 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -7,10 +7,13 @@ B0=${B0:=/d/backends};        # top level of brick directories
 H0=${H0:=`hostname --fqdn`};  # hostname
 DEBUG=${DEBUG:=0}             # turn on debugging?
 statedumpdir=`gluster --print-statedumpdir`; # Default directory for statedump
-CHILD_UP_TIMEOUT=60
 CLI="gluster --mode=script";
 
+CHILD_UP_TIMEOUT=60
+NFS_EXPORT_TIMEOUT=20
+UMOUNT_TIMEOUT=5
 PROCESS_UP_TIMEOUT=20
+
 mkdir -p $B0;
 mkdir -p $M0 $M1;
 mkdir -p $N0 $N1;
@@ -225,6 +228,17 @@ function cleanup()
                 umount $m
         done
 
+        # unregister nfs and related services from portmapper/rpcbind
+        ## nfs
+        rpcinfo -d 100003 3
+        ## mountd
+        rpcinfo -d 100005 1
+        rpcinfo -d 100005 3
+        ## nlockmgr
+        rpcinfo -d 100021 1
+        rpcinfo -d 100021 4
+        ## nfs_acl
+        rpcinfo -d 100227 3
 
         LOOPDEVICES=`losetup -a | grep "$B0/" | awk '{print $1}' | tr -d :`
         for l in $LOOPDEVICES;