From 40582c38fbae1909335fbba64dfc9bbf96a6a563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 7 Sep 2017 11:29:07 +0300 Subject: [PATCH] MXS-1389: Fix fwf test rules The new tests now use the correct syntax for the rule files. --- maxscale-system-test/fw/pass12 | 1 - maxscale-system-test/fw/rules11 | 2 +- maxscale-system-test/fw/rules12 | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/maxscale-system-test/fw/pass12 b/maxscale-system-test/fw/pass12 index e10091e2f..24ef8ad87 100644 --- a/maxscale-system-test/fw/pass12 +++ b/maxscale-system-test/fw/pass12 @@ -4,4 +4,3 @@ INSERT INTO t1 VALUES (1, 1, 1); SELECT name, address, email FROM t1; SELECT name, address, SUM(email) FROM t1; SELECT CAST(name AS TEXT), CAST(address AS TEXT), SUM(email) FROM t1; - diff --git a/maxscale-system-test/fw/rules11 b/maxscale-system-test/fw/rules11 index 52a6c6850..cf4a1f3b8 100644 --- a/maxscale-system-test/fw/rules11 +++ b/maxscale-system-test/fw/rules11 @@ -1,2 +1,2 @@ -rule no_func deny functions sum avg +rule no_func deny function sum avg users %@% match any rules no_func diff --git a/maxscale-system-test/fw/rules12 b/maxscale-system-test/fw/rules12 index 07fd196fd..d94b4ba93 100644 --- a/maxscale-system-test/fw/rules12 +++ b/maxscale-system-test/fw/rules12 @@ -1,2 +1,2 @@ -rule no_func deny functions sum avg columns name address +rule no_func deny function sum avg columns name address users %@% match any rules no_func