@@ -6,6 +6,7 @@
%cnt2 type counter;ok
%qt1 type quota 25 mbytes;ok
%qt2 type quota over 1 kbytes;ok
+%cthelp2 type ct helper { type \"ftp\" protocol tcp\; l3proto ip6\; };fail
ip saddr 192.168.1.3 counter name "cnt2";ok
ip saddr 192.168.1.3 counter name "cnt3";fail
@@ -517,12 +517,23 @@ def obj_add(o, test_result, filename, lineno):
print_error(reason, filename, lineno)
return -1
- if not _obj_exist(o, filename, lineno):
- reason = "I have just added the " + obj_handle + \
- " to the table " + table.name + " but it does not exist"
+ exist = _obj_exist(o, filename, lineno)
+
+ if exist:
+ if test_result == "ok":
+ return 0
+ reason = "I added the " + obj_handle + \
+ " to the table " + table.name + " but it should have failed"
print_error(reason, filename, lineno)
return -1
+ if test_result == "fail":
+ return 0
+
+ reason = "I have just added the " + obj_handle + \
+ " to the table " + table.name + " but it does not exist"
+ print_error(reason, filename, lineno)
+ return -1
def obj_delete(table, filename=None, lineno=None):
'''
It should not be possible to add a ip6 restricted helper to ip family. Signed-off-by: Florian Westphal <fw@strlen.de> --- not part of v1 series. tests/py/ip/objects.t | 1 + tests/py/nft-test.py | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-)