tests/shell: Fix sporadic fail of include/0007glob_double_0

Since ruleset listing shows tables sorted by handle (which in turn
depends on table creation ordering), using random filenames here
guarantees to make the test fail randomly.

Since the include files reside in a temporary directory anyway, there is
no need to randomize their names so simplify the whole test a bit.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/shell/testcases/include/0007glob_double_0 b/tests/shell/testcases/include/0007glob_double_0
index 9b45a62de7ac2e531c086197763189151b174093..00c3efcb5d2963ca6b94371e4e46b4e1dc10f993 100755 (executable)
--- a/tests/shell/testcases/include/0007glob_double_0
+++ b/tests/shell/testcases/include/0007glob_double_0
@@ -8,36 +8,24 @@ if [ ! -d $tmpdir ] ; then
         exit 0
 fi
 
-tmpfile1=$(mktemp -p $tmpdir)
-if [ ! -w $tmpfile1 ] ; then
-        echo "Failed to create tmp file" >&2
-        exit 0
-fi
-
-tmpfile2=$(mktemp -p $tmpdir)
-if [ ! -w $tmpfile2 ] ; then
-        echo "Failed to create tmp file" >&2
-        exit 0
-fi
-
-tmpfile3=$(mktemp)
-if [ ! -w $tmpfile3 ] ; then
+tmpfile=$(mktemp)
+if [ ! -w $tmpfile ] ; then
         echo "Failed to create tmp file" >&2
         exit 0
 fi
 
 # cleanup if aborted
-trap "rm -rf $tmpfile1 $tmpfile2 $tmpfile3 && rmdir $tmpdir" EXIT
+trap "rm -rf $tmpdir $tmpfile" EXIT
 
 RULESET1="add table x"
 RULESET2="add table y"
 RULESET3="include \"$tmpdir/*\""
 
-echo "$RULESET1" > $tmpfile1
-echo "$RULESET2" > $tmpfile2
-echo "$RULESET3" > $tmpfile3
+echo "$RULESET1" > $tmpdir/table_x
+echo "$RULESET2" > $tmpdir/table_y
+echo "$RULESET3" > $tmpfile
 
-$NFT -f $tmpfile3
+$NFT -f $tmpfile
 
 if [ $? -ne 0 ] ; then
         echo "E: unable to load good ruleset" >&2

diff --git a/tests/shell/testcases/include/dumps/0007glob_double_0.nft b/tests/shell/testcases/include/dumps/0007glob_double_0.nft
index f9cb080ffd19a13f7aa071d153bd42f558029fa8..e4e5f9b1794c8b77264e904244c284ffa1321eec 100644 (file)
--- a/tests/shell/testcases/include/dumps/0007glob_double_0.nft
+++ b/tests/shell/testcases/include/dumps/0007glob_double_0.nft
@@ -1,4 +1,4 @@
-table ip y {
-}
 table ip x {
 }
+table ip y {
+}