diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/basic/volume-snapshot.t | 4 | ||||
-rw-r--r-- | tests/bugs/bug-1040934.t | 2 | ||||
-rw-r--r-- | tests/bugs/bug-1045333.t | 6 | ||||
-rwxr-xr-x | tests/bugs/bug-1049834.t | 2 | ||||
-rwxr-xr-x | tests/snapshot.rc | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/basic/volume-snapshot.t b/tests/basic/volume-snapshot.t index 4bc0792db..bea11e215 100755 --- a/tests/basic/volume-snapshot.t +++ b/tests/basic/volume-snapshot.t @@ -18,10 +18,10 @@ function create_volumes() { } function create_snapshots() { - $CLI_1 snapshot create $V0 -n ${V0}_snap & + $CLI_1 snapshot create ${V0}_snap ${V0}& PID_1=$! - $CLI_1 snapshot create $V1 -n ${V1}_snap & + $CLI_1 snapshot create ${V1}_snap ${V1}& PID_2=$! wait $PID_1 $PID_2 diff --git a/tests/bugs/bug-1040934.t b/tests/bugs/bug-1040934.t index d057f0cb7..3089d7ce1 100644 --- a/tests/bugs/bug-1040934.t +++ b/tests/bugs/bug-1040934.t @@ -19,7 +19,7 @@ EXPECT 'Created' volinfo_field $V0 'Status' TEST $CLI_1 volume start $V0 EXPECT 'Started' volinfo_field $V0 'Status' -TEST $CLI_1 snapshot create $V0 -n ${V0}_snap +TEST $CLI_1 snapshot create ${V0}_snap ${V0} PID_1=$! wait $PID_1 diff --git a/tests/bugs/bug-1045333.t b/tests/bugs/bug-1045333.t index 59ef1c5e7..d1f8069e8 100644 --- a/tests/bugs/bug-1045333.t +++ b/tests/bugs/bug-1045333.t @@ -18,13 +18,13 @@ S2="-${V0}-snap2" #Create snapshot with name starts with hyphen(-) #Create snapshot with a long name S3="${V0}_single_gluster_volume_is_accessible_by_multiple_clients_offline_snapshot_is_a_long_name" -TEST $CLI snapshot create $V0 -n $S1 +TEST $CLI snapshot create $S1 $V0 TEST snapshot_exists $S1 -TEST $CLI snapshot create $V0 -n $S2 +TEST $CLI snapshot create $S2 $V0 TEST snapshot_exists $S2 -TEST $CLI snapshot create $V0 -n $S3 +TEST $CLI snapshot create $S3 $V0 TEST snapshot_exists $S3 diff --git a/tests/bugs/bug-1049834.t b/tests/bugs/bug-1049834.t index 6587fb765..6019a561c 100755 --- a/tests/bugs/bug-1049834.t +++ b/tests/bugs/bug-1049834.t @@ -29,7 +29,7 @@ TEST create_n_snapshots $V0 4 $V0_snap TEST snapshot_n_exists $V0 4 $V0_snap #Creating the 5th snapshots on the volume and expecting it not to be created. -TEST ! $CLI_1 snapshot create $V0 -n ${V0}_snap5 +TEST ! $CLI_1 snapshot create ${V0}_snap5 ${V0} TEST ! snapshot_exists ${V0}_snap5 TEST ! $CLI_1 snapshot delete ${V0}_snap5 diff --git a/tests/snapshot.rc b/tests/snapshot.rc index 52481b0fb..5dc2e904a 100755 --- a/tests/snapshot.rc +++ b/tests/snapshot.rc @@ -189,7 +189,7 @@ function create_n_snapshots() { local snap_name=$3 local ret=0 for i in `seq 1 $snap_count`; do - $CLI_1 snapshot create ${vol} -n $snap_name$i & + $CLI_1 snapshot create $snap_name$i ${vol}& PID_1=$! wait $PID_1 ret=$? |