tests: py: update format of registers in bitwise payloads.

libnftnl has been changed to bring the format of registers in bitwise
dumps in line with those in other types of expression.  Update the
expected output of Python test-cases.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/py/any/ct.t.payload b/tests/py/any/ct.t.payload
index 2f4ba4a7..51a82503 100644
--- a/tests/py/any/ct.t.payload
+++ b/tests/py/any/ct.t.payload
@@ -1,7 +1,7 @@
 # ct state new,established, related, untracked
 ip test-ip4 output
   [ ct load state => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x0000004e ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x0000004e ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
 
 # ct state != related
@@ -28,21 +28,21 @@ ip test-ip4 output
 # ct state invalid drop
 ip test-ip4 output
   [ ct load state => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000001 ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
   [ immediate reg 0 drop ]
 
 # ct state established accept
 ip test-ip4 output
   [ ct load state => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000002 ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
   [ immediate reg 0 accept ]
 
 # ct state 8
 ip test-ip4 output
   [ ct load state => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000008 ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000008 ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
 
 # ct direction original
@@ -84,7 +84,7 @@ ip test-ip4 output
 # ct status expected
 ip test-ip4 output
   [ ct load status => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000001 ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
 
 # ct status != expected
@@ -95,7 +95,7 @@ ip test-ip4 output
 # ct status seen-reply
 ip test-ip4 output
   [ ct load status => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000002 ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
 
 # ct status != seen-reply
@@ -127,25 +127,25 @@ ip test-ip4 output
 # ct mark or 0x23 == 0x11
 ip test-ip4 output
   [ ct load mark => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0xffffffdc ) ^ 0x00000023 ]
+  [ bitwise reg 1 = ( reg 1 & 0xffffffdc ) ^ 0x00000023 ]
   [ cmp eq reg 1 0x00000011 ]
 
 # ct mark or 0x3 != 0x1
 ip test-ip4 output
   [ ct load mark => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0xfffffffc ) ^ 0x00000003 ]
+  [ bitwise reg 1 = ( reg 1 & 0xfffffffc ) ^ 0x00000003 ]
   [ cmp neq reg 1 0x00000001 ]
 
 # ct mark and 0x23 == 0x11
 ip test-ip4 output
   [ ct load mark => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000023 ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000023 ) ^ 0x00000000 ]
   [ cmp eq reg 1 0x00000011 ]
 
 # ct mark and 0x3 != 0x1
 ip test-ip4 output
   [ ct load mark => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000003 ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000003 ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000001 ]
 
 # ct mark xor 0x23 == 0x11
@@ -332,7 +332,7 @@ ip test-ip4 output
 # ct mark set (meta mark | 0x10) << 8
 inet test-inet output
   [ meta load mark => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0xffffffef ) ^ 0x00000010 ]
+  [ bitwise reg 1 = ( reg 1 & 0xffffffef ) ^ 0x00000010 ]
   [ bitwise reg 1 = ( reg 1 << 0x00000008 ) ]
   [ ct set mark with reg 1 ]
 
@@ -378,19 +378,19 @@ ip test-ip4 output
 # ct status expected,seen-reply,assured,confirmed,snat,dnat,dying
 ip test-ip4 output
   [ ct load status => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x0000023f ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x0000023f ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
 
 # ct status snat
 ip test-ip4 output
   [ ct load status => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000010 ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
 
 # ct status dnat
 ip test-ip4 output
   [ ct load status => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000020 ) ^ 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000020 ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
 
 # ct event set new
@@ -426,7 +426,7 @@ ip test-ip4 output
 # ct label 127
 ip test-ip4 output
   [ ct load label => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0x00000000 0x00000000 0x00000000 0x80000000 ) ^ 0x00000000 0x00000000 0x00000000 0x00000000 ]
+  [ bitwise reg 1 = ( reg 1 & 0x00000000 0x00000000 0x00000000 0x80000000 ) ^ 0x00000000 0x00000000 0x00000000 0x00000000 ]
   [ cmp neq reg 1 0x00000000 0x00000000 0x00000000 0x00000000 ]
 
 # ct label set 127
@@ -503,7 +503,7 @@ ip test-ip4 output
 # ct mark set ct mark or 0x00000001
 ip test-ip4 output
   [ ct load mark => reg 1 ]
-  [ bitwise reg 1 = (reg=1 & 0xfffffffe ) ^ 0x00000001 ]
+  [ bitwise reg 1 = ( reg 1 & 0xfffffffe ) ^ 0x00000001 ]
   [ ct set mark with reg 1 ]
 
 # ct id 12345