diff options
| -rw-r--r-- | tests/00-geo-rep/georep-basic-dr-rsync-arbiter.t | 4 | ||||
| -rw-r--r-- | tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t | 4 | ||||
| -rw-r--r-- | tests/geo-rep.rc | 34 |
3 files changed, 21 insertions, 21 deletions
diff --git a/tests/00-geo-rep/georep-basic-dr-rsync-arbiter.t b/tests/00-geo-rep/georep-basic-dr-rsync-arbiter.t index 38ef9f0b6d4..0e7dd84a8e5 100644 --- a/tests/00-geo-rep/georep-basic-dr-rsync-arbiter.t +++ b/tests/00-geo-rep/georep-basic-dr-rsync-arbiter.t @@ -171,7 +171,7 @@ TEST $GEOREP_CLI $master $slave stop TEST create_symlink_rename_mkdir_data #hardlink-rename-unlink usecase. Sonatype Nexus3 Usecase. BUG:1512483 -TEST create_hardlink_rename_data +#TEST create_hardlink_rename_data #rsnapshot usecase TEST create_rsnapshot_data @@ -191,7 +191,7 @@ EXPECT_WITHIN $GEO_REP_TIMEOUT 0 hardlink_rename_ok ${slave_mnt}/hardlink_rename EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_symlink_rename_mkdir_data ${slave_mnt}/symlink_test1 #hardlink-rename-unlink usecase. Sonatype Nexus3 Usecase. BUG:1512483 -EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_hardlink_rename_data ${slave_mnt} +#EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_hardlink_rename_data ${slave_mnt} #rsnapshot usecase EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_rsnapshot_data ${slave_mnt} diff --git a/tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t b/tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t index 0610d2296c7..66567091a4b 100644 --- a/tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t +++ b/tests/00-geo-rep/georep-basic-dr-tarssh-arbiter.t @@ -174,7 +174,7 @@ TEST $GEOREP_CLI $master $slave stop TEST create_symlink_rename_mkdir_data #hardlink-rename-unlink usecase. Sonatype Nexus3 Usecase. BUG:1512483 -TEST create_hardlink_rename_data +#TEST create_hardlink_rename_data #rsnapshot usecase TEST create_rsnapshot_data @@ -194,7 +194,7 @@ EXPECT_WITHIN $GEO_REP_TIMEOUT 0 hardlink_rename_ok ${slave_mnt}/hardlink_rename EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_symlink_rename_mkdir_data ${slave_mnt}/symlink_test1 #hardlink-rename-unlink usecase. Sonatype Nexus3 Usecase. BUG:1512483 -EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_hardlink_rename_data ${slave_mnt} +#EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_hardlink_rename_data ${slave_mnt} #rsnapshot usecase EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_rsnapshot_data ${slave_mnt} diff --git a/tests/geo-rep.rc b/tests/geo-rep.rc index da22c4befe4..b762a333aca 100644 --- a/tests/geo-rep.rc +++ b/tests/geo-rep.rc @@ -170,7 +170,7 @@ function symlink_ok() else local fname=$(readlink $symlink_file) if test "X$fname" != "X$orig_file_name"; then - echo 1 + echo 2 else echo 0 fi @@ -186,7 +186,7 @@ function rename_file_ok() if [ -f $old_name ]; then echo 1 elif [ ! -f $new_name ]; then - echo 1 + echo 2 else echo 0 fi @@ -200,7 +200,7 @@ function rename_dir_ok() if [ -d $old_name ]; then echo 1 elif [ ! -d $new_name ]; then - echo 1 + echo 2 else echo 0 fi @@ -291,9 +291,9 @@ function hardlink_rename_ok() if [ ! -f "$file_name" ]; then echo 1 elif [ ! -f "$file_name.hl1" ]; then - echo 1 + echo 2 elif [ -f "$file_name.hl" ]; then - echo 1 + echo 3 else echo 0 fi @@ -313,9 +313,9 @@ function verify_symlink_rename_mkdir_data() if [ ! -f $sym_dir/file1 ]; then echo 1 elif [ ! -h $sym_dir/rn_sym_link ]; then - echo 1 + echo 2 elif [ ! -d $sym_dir/sym_link ]; then - echo 1 + echo 3 else echo 0 fi @@ -341,17 +341,17 @@ function verify_rsnapshot_data() if [ ! -d "$dir" ]; then echo 1 elif [ ! -h $dir/a_symlink ]; then - echo 1 + echo 2 elif test "X$(readlink $dir/a_symlink)" != "X/does/not/exist2"; then - echo 1 + echo 3 elif [ ! -h $dir0/a_symlink ]; then - echo 1 + echo 4 elif test "X$(readlink $dir0/a_symlink)" != "X/does/not/exist"; then - echo 1 + echo 5 elif [ ! -h $dir1/a_symlink ]; then - echo 1 + echo 6 elif test "X$(readlink $dir1/a_symlink)" != "X/does/not/exist2"; then - echo 1 + echo 7 else echo 0 fi @@ -373,13 +373,13 @@ function verify_hardlink_rename_data() if [ ! -d $dir ]; then echo 1 elif [ -f $dir/f1 ]; then - echo 1 + echo 2 elif [ -f $dir/f2 ]; then - echo 1 + echo 3 elif [ ! -f $dir/f3 ]; then - echo 1 + echo 4 elif test "Xtest_data" != "X$(cat $dir/f3)"; then - echo 1 + echo 5 else echo 0 fi |