diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-04-10 19:00:24 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-04-11 09:57:28 +0200 |
| commit | e760d200a4b9cd31928b68a1f2f882157344351e (patch) | |
| tree | 036bb19faa6f17ff5eec97520ea8caa4b18e56e7 /tests/py/any/ct.t | |
| parent | 4885331de84cbb895d31b83696a9b6d6542f2a81 (diff) | |
tests/py: Use libnftables instead of calling nft binary
This adds a simple nftables Python class in py/nftables.py which gives
access to libnftables API via ctypes module.
nft-test.py is extended to make use of the above class instead of
calling nft binary. Since command line formatting had to be touched
anyway, this patch also streamlines things a bit by introducing
__str__ methods to classes Table and Chain and making extensive use of
format strings instead of onerously adding all string parts together.
Since the called commands don't see a shell anymore, all shell meta
character escaping done in testcases is removed.
The visible effects of this change are:
* Four new warnings in ip/flowtable.t due to changing objref IDs (will
be addressed later in a patch to libnftnl).
* Reported command line in warning and error messages changed slightly
for obvious reasons.
* Reduction of a full test run's runtime by a factor of four. Status
diff after running with 'time':
< 83 test files, 77 files passed, 1724 unit tests, 0 error, 33 warning
< 87.23user 696.13system 15:11.82elapsed 85%CPU (0avgtext+0avgdata 9604maxresident)k
< 8inputs+36800outputs (0major+35171235minor)pagefaults 0swaps
> 83 test files, 77 files passed, 1724 unit tests, 4 error, 33 warning
> 6.80user 30.18system 3:45.86elapsed 16%CPU (0avgtext+0avgdata 14064maxresident)k
> 0inputs+35808outputs (0major+2874minor)pagefaults 0swaps
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py/any/ct.t')
| -rw-r--r-- | tests/py/any/ct.t | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/py/any/ct.t b/tests/py/any/ct.t index 6334dd76..ce6d51a4 100644 --- a/tests/py/any/ct.t +++ b/tests/py/any/ct.t @@ -75,19 +75,19 @@ ct expiration != {33-55};ok;ct expiration != { 33s-55s} ct helper "ftp";ok ct helper "12345678901234567";fail -ct helper '""';fail +ct helper "";fail ct state . ct mark { new . 0x12345678};ok ct state . ct mark { new . 0x12345678, new . 0x34127856, established . 0x12785634};ok ct direction . ct mark { original . 0x12345678};ok ct state . ct mark vmap { new . 0x12345678 : drop};ok -ct original bytes \> 100000;ok;ct original bytes > 100000 -ct reply packets \< 100;ok;ct reply packets < 100 -ct bytes \> 100000;ok;ct bytes > 100000 +ct original bytes > 100000;ok +ct reply packets < 100;ok +ct bytes > 100000;ok -ct avgpkt \> 200;ok;ct avgpkt > 200 -ct original avgpkt \< 500;ok;ct original avgpkt < 500 +ct avgpkt > 200;ok +ct original avgpkt < 500;ok # bogus direction ct both bytes gt 1;fail @@ -107,7 +107,7 @@ ct mark original;fail ct event set new;ok ct event set new or related or destroy or foobar;fail -ct event set 'new | related | destroy | label';ok;ct event set new,related,destroy,label +ct event set new | related | destroy | label;ok;ct event set new,related,destroy,label ct event set new,related,destroy,label;ok ct event set new,destroy;ok ct event set 1;ok;ct event set new |