From a6a9008c4342998506e1a3949123aa566f12ea1c Mon Sep 17 00:00:00 2001
From: Philip Whineray <phil@firehol.org>
Date: Mon, 13 Aug 2018 09:00:46 +0100
Subject: [PATCH] Further unit test hardening

---
 tests/Makefile.am        | 1 +
 tests/tools/clean-class  | 1 +
 tests/tools/clean-filter | 7 +++++++
 tests/tools/clean-qdisc  | 1 +
 tests/unittest           | 4 +++-
 5 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100755 tests/tools/clean-filter

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 82185a0..b68a3d4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,6 +33,7 @@ endif
 TOOLS = \
   README.md \
   tools/clean-class \
+  tools/clean-filter \
   tools/clean-iptables \
   tools/clean-qdisc \
   tools/clean-rules \
diff --git a/tests/tools/clean-class b/tests/tools/clean-class
index 2497dc7..240045e 100755
--- a/tests/tools/clean-class
+++ b/tests/tools/clean-class
@@ -2,5 +2,6 @@
 
 while (<>) {
   s/Kbit/000bit/g;
+  if (/8000/) { s/ prio r/ prio 1 r/g; } else { s/ prio r/ prio 0 r/g; }
   print;
 }
diff --git a/tests/tools/clean-filter b/tests/tools/clean-filter
new file mode 100755
index 0000000..b6898b9
--- /dev/null
+++ b/tests/tools/clean-filter
@@ -0,0 +1,7 @@
+#!/usr/bin/perl -w
+
+while (<>) {
+  s/chain 0 //;
+  s/ not_in_hw//;
+  print;
+}
diff --git a/tests/tools/clean-qdisc b/tests/tools/clean-qdisc
index 45a6586..9628a02 100755
--- a/tests/tools/clean-qdisc
+++ b/tests/tools/clean-qdisc
@@ -3,6 +3,7 @@
 my @lines;
 while (<>) {
   s/ memory_limit [^ ]*//g;
+  s/ default 32768 / default 8000 /g;
   push @lines, $_;
 }
 
diff --git a/tests/unittest b/tests/unittest
index 9c24317..c6caf32 100755
--- a/tests/unittest
+++ b/tests/unittest
@@ -301,6 +301,7 @@ do
 		CACHE_DIR=/var/run/firehol/update-ipsets/cache
 		LIB_DIR=/var/run/firehol/update-ipsets/lib
 		WEB_DIR=/var/run/firehol/webdir
+		FIREQOS_INTERFACE_DEFAULT_CLASSID=8000
 		export PATH=
 	!
 
@@ -385,9 +386,10 @@ do
         fireqos)
           tc qdisc show dev veth0 > "$outqdisc.raw"
           tc class show dev veth0 > "$outclass".raw
-          tc filter show dev veth0 > "$outfilter"
+          tc filter show dev veth0 > "$outfilter".raw
           $dirname/tools/clean-qdisc "$outqdisc".raw > "$outqdisc"
           $dirname/tools/clean-class "$outclass".raw > "$outclass"
+          $dirname/tools/clean-filter "$outfilter".raw > "$outfilter"
           if ! cmp "$audqdisc" "$outqdisc"
           then
             errors=$((errors + 1))