* use multiop and kill keepopen

diff --git a/lustre/tests/keepopen.py b/lustre/tests/keepopen.py
deleted file mode 100755 (executable)
index fbde2d0..0000000
--- a/lustre/tests/keepopen.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-import os, signal, sys, time
-
-# recieved after the file has been deleted
-# attempt to read the file and exit with status
-def sigusr1(signum, frame):
-    try:
-        data = f.read()
-    except Exception, e:
-        print "keepopen: read failed", e
-        sys.exit(1)
-
-    f.close()
-    if data == tag:
-        print "keepopen: success: ", data
-        sys.exit(0)
-    else:
-        print "keepopen: bad data: ", data
-        sys.exit(2)
-
-signal.signal(signal.SIGUSR1, sigusr1)
-
-tag = "test data"
-filename = sys.argv[1]
-os.system("echo -n %s > %s" %(tag, filename))
-
-f = open(filename, 'r')
-while 1:
-    time.sleep(10)

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 0c65a31..94bf07e 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -239,20 +239,18 @@ test_7() {
 run_test 7 "create open write rename |X| create-old-name read"
 
 test_8() {
-    keepopen.py $MOUNTPT/f8 &
+    mcreate $MOUNTPT/f8 
+    multiop $MOUNTPT/f8 o_Sc &
     pid=$!
-    # wait until keepopen has created the file
-    while [ ! -e $MOUNTPT/f8 ]; do sleep 1; done
-    mcreate $MOUNTPT/f8b
+    # give multiop a chance to open
+    sleep 1 
     rm -f $MOUNTPT/f8
     replay_barrier mds
     kill -USR1 $pid
-    wait $pid || return 6
+    wait $pid || return 1
 
     fail mds
-    [ -e $MOUNTPT/f8 ] && return 7
-    rm $MOUNTPT/f8b
-    [ -e $MOUNTPT/f8b ] && return 8
+    [ -e $MOUNTPT/f8 ] && return 2
     return 0
 }
 run_test 8 "open, unlink |X| close"