Whamcloud - gitweb
LU-8989 tests: fix sanity test_256() use of hardcoded filename 54/27354/4
authorChris Hanna <hannac@iu.edu>
Tue, 30 May 2017 21:25:00 +0000 (17:25 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Wed, 7 Jun 2017 20:32:02 +0000 (20:32 +0000)
Description: test_256() in sanity test suite uses a hardcoded file name.
Switching to mktemp like other tests.

Test-Parameters: trivial
Change-Id: I013c86cea1af5769f81119aa2aaeb63766a2cec9
Signed-off-by: Chris Hanna <hannac@iu.edu>
Reviewed-on: https://review.whamcloud.com/27354
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
lustre/tests/sanity.sh

index 9f4fa37..6d66dbe 100755 (executable)
@@ -14922,9 +14922,11 @@ test_256() {
 
        #after mount new plainllog is used
        touch $DIR/$tdir/{11..19}
 
        #after mount new plainllog is used
        touch $DIR/$tdir/{11..19}
+       local TEMP256FILE=$(mktemp TEMP256XXXXXX)
        cat_sl=$(do_facet mds1 \
        cat_sl=$(do_facet mds1 \
-       "$DEBUGFS -R \\\"dump changelog_catalog cat.dmp\\\" $mdt_dev; \
-        llog_reader cat.dmp | grep \\\"type=1064553b\\\" | wc -l")
+       "$DEBUGFS -R \\\"dump changelog_catalog $TEMP256FILE\\\" $mdt_dev; \
+        llog_reader $TEMP256FILE | grep \\\"type=1064553b\\\" | wc -l")
+       rm $TEMP256FILE
 
        if (( cat_sl != 2 )); then
                do_facet mds1 $LCTL --device $MDT0 changelog_deregister $cl_user
 
        if (( cat_sl != 2 )); then
                do_facet mds1 $LCTL --device $MDT0 changelog_deregister $cl_user
@@ -14933,9 +14935,11 @@ test_256() {
 
        $LFS changelog_clear $MDT0 $cl_user 0
 
 
        $LFS changelog_clear $MDT0 $cl_user 0
 
+       TEMP256FILE=$(mktemp TEMP256XXXXXX)
        cat_sl=$(do_facet mds1 \
        cat_sl=$(do_facet mds1 \
-       "$DEBUGFS -R \\\"dump changelog_catalog cat.dmp\\\" $mdt_dev; \
-        llog_reader cat.dmp | grep \\\"type=1064553b\\\" | wc -l")
+       "$DEBUGFS -R \\\"dump changelog_catalog $TEMP256FILE\\\" $mdt_dev; \
+        llog_reader $TEMP256FILE | grep \\\"type=1064553b\\\" | wc -l")
+       rm $TEMP256FILE
 
        do_facet mds1 $LCTL --device $MDT0 changelog_deregister $cl_user
 
 
        do_facet mds1 $LCTL --device $MDT0 changelog_deregister $cl_user