From 0f056f28c13ea9e7c8bc322bf9dfdeeaf8b44339 Mon Sep 17 00:00:00 2001
From: Martin Teichmann <martin.teichmann@gmail.com>
Date: Sat, 14 Jan 2023 19:13:14 +0000
Subject: [PATCH] fix tests
---
ebpfcat/ebpf_test.py | 18 ++++++------------
ebpfcat/ethercat_test.py | 2 +-
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/ebpfcat/ebpf_test.py b/ebpfcat/ebpf_test.py
index 6cea964..50f8886 100644
--- a/ebpfcat/ebpf_test.py
+++ b/ebpfcat/ebpf_test.py
@@ -704,11 +704,11 @@ class KernelTests(TestCase):
class Global(EBPF):
map = ArrayMap()
ar = map.globalVar()
- aw = map.globalVar(write=True)
+ aw = map.globalVar()
class Sub(SubProgram):
br = Global.map.globalVar()
- bw = Global.map.globalVar(write=True)
+ bw = Global.map.globalVar()
def program(self):
self.br -= -33
@@ -726,7 +726,6 @@ class KernelTests(TestCase):
fd, _ = e.load(log_level=1)
prog_test_run(fd, 1000, 1000, 100, 100, 1)
- e.map.readwrite()
self.assertEqual(e.ar, 7)
self.assertEqual(e.aw, 11)
self.assertEqual(s1.br, 33)
@@ -743,15 +742,13 @@ class KernelTests(TestCase):
self.assertEqual(s1.bw, 36)
self.assertEqual(s2.br, 165)
self.assertEqual(s2.bw, 36)
- e.map.readwrite()
prog_test_run(fd, 1000, 1000, 0, 0, 1)
- e.map.readwrite()
self.assertEqual(e.ar, 21)
self.assertEqual(e.aw, 25)
- self.assertEqual(s1.br, 66)
- self.assertEqual(s1.bw, 69)
- self.assertEqual(s2.br, 66)
- self.assertEqual(s2.bw, 69)
+ self.assertEqual(s1.br, 36)
+ self.assertEqual(s1.bw, 39)
+ self.assertEqual(s2.br, 198)
+ self.assertEqual(s2.bw, 201)
def test_minimal(self):
class Local(EBPF):
@@ -760,12 +757,9 @@ class KernelTests(TestCase):
e = Local(ProgType.XDP, "GPL")
e.a = 7
e.a += 3
- e.mI[e.r1] += e.r1
- e.a -= 3
e.exit()
print(e.opcodes)
print(e.load(log_level=1)[1])
- self.fail()
if __name__ == "__main__":
diff --git a/ebpfcat/ethercat_test.py b/ebpfcat/ethercat_test.py
index f95f0c7..c1b3a81 100644
--- a/ebpfcat/ethercat_test.py
+++ b/ebpfcat/ethercat_test.py
@@ -313,7 +313,7 @@ class Tests(TestCase):
#sg.opcodes = sg.opcodes[:-1]
print(sg.load(log_level=1)[1])
self.maxDiff = None
- self.assertEqual(sg.opcodes, [])
+ #self.assertEqual(sg.opcodes, [])
if __name__ == "__main__":
--
GitLab