diff options
Diffstat (limited to 'tests/basic')
| -rw-r--r-- | tests/basic/mpx-compat.t | 4 | ||||
| -rw-r--r-- | tests/basic/multiplex.t | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/basic/mpx-compat.t b/tests/basic/mpx-compat.t index 453011c015..baf629dbf9 100644 --- a/tests/basic/mpx-compat.t +++ b/tests/basic/mpx-compat.t @@ -23,8 +23,6 @@ function count_brick_pids { cleanup TEST glusterd TEST $CLI volume set all cluster.brick-multiplex yes -push_trapfunc "$CLI volume set all cluster.brick-multiplex off" -push_trapfunc "cleanup" # Create two vanilla volumes. TEST $CLI volume create $V0 $H0:$B0/brick-${V0}-{0,1} @@ -51,3 +49,5 @@ TEST $CLI volume start $V1 # There should be two processes this time (can't share protocol/server). EXPECT_WITHIN $PROCESS_UP_TIMEOUT "2" count_processes + +cleanup;
\ No newline at end of file diff --git a/tests/basic/multiplex.t b/tests/basic/multiplex.t index 2f0f462f14..2f558a6824 100644 --- a/tests/basic/multiplex.t +++ b/tests/basic/multiplex.t @@ -21,8 +21,6 @@ cleanup TEST glusterd TEST $CLI volume set all cluster.brick-multiplex on -push_trapfunc "$CLI volume set all cluster.brick-multiplex off" -push_trapfunc "cleanup" TEST $CLI volume create $V0 $H0:$B0/brick{0,1} TEST $CLI volume set $V0 features.trash enable @@ -77,3 +75,4 @@ TEST glusterd EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT 1 count_brick_pids EXPECT_WITHIN $PROCESS_DOWN_TIMEOUT 1 count_brick_processes +cleanup;
\ No newline at end of file |