Skip to content

Commit

Permalink
tests: module: follow the changed RoutingTableRecorder output
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZoltanBojthe
ZoltanBojthe committed Jan 17, 2024
1 parent 34b76a2 commit 7f61c52
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 62 deletions.
40 changes: 20 additions & 20 deletions tests/module/AODVLifecycleTest.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,28 +116,28 @@ snapshot-file = "${resultdir}/${configname}-${runnumber}.sna"
</scenario>
%#--------------------------------------------------------------------------------------------------------------
%contains-regex: results/General-0.rt
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.2004\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.4/32 145\.236\.0\.4 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2041\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.4/32 145\.236\.0\.2 wlan0
\-R #\d+ 12\.3s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\-R #\d+ 12\.3s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\-R #\d+ 12\.3s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.4/32 145\.236\.0\.4 wlan0
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*?
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*?
\+R #\d+ 3\.1998\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
\+R #\d+ 3\.1998\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
\+R #\d+ 3\.1998\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.2 wlan0 .*?
\+R #\d+ 3\.2004\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.4/32 145\.236\.0\.4 wlan0 .*?
\+R #\d+ 3\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
\+R #\d+ 3\.2008\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
\+R #\d+ 3\.2008\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
\+R #\d+ 3\.2041\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.4/32 145\.236\.0\.2 wlan0 .*?
\-R #\d+ 12\.3s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*?
\-R #\d+ 12\.3s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
\-R #\d+ 12\.3s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.4/32 145\.236\.0\.4 wlan0 .*?
\-R #\d+ 12\.3s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.0/16 <unspec> wlan0
\-R #\d+ 12\.3s AODVTest\.intermediateNodeA 145\.236\.0\.2 127\.0\.0\.0/8 <unspec> lo0
\*R #\d+ 14\.2008\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.3 wlan0
\+R #\d+ 14\.2014\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.4/32 145\.236\.0\.4 wlan0
\*R #\d+ 14\.2061\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.4/32 145\.236\.0\.3 wlan0
\-R #\d+ 21\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\-R #\d+ 28\.2952\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\-R #\d+ 30\.1960\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\*R #\d+ 14\.2008\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.3 wlan0 .*?
\+R #\d+ 14\.2014\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.4/32 145\.236\.0\.4 wlan0 .*?
\*R #\d+ 14\.2061\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.4/32 145\.236\.0\.3 wlan0 .*?
\-R #\d+ 21\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
\-R #\d+ 28\.2952\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
\-R #\d+ 30\.1960\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
%#--------------------------------------------------------------------------------------------------------------
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true
%not-contains: test_undisposed.out
Expand Down
40 changes: 20 additions & 20 deletions tests/module/AODVShortestPath.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,26 +111,26 @@ snapshot-file = "${resultdir}/${configname}-${runnumber}.sna"
%#--------------------------------------------------------------------------------------------------------------
%contains-regex: results/General-0.rt
.*
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.receiver 145\.236\.0\.5 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.receiver 145\.236\.0\.5 145\.236\.0\.1/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2014\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.5/32 145\.236\.0\.5 wlan0
\+R #\d+ 3\.2061\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.5/32 145\.236\.0\.3 wlan0
-R #\d+ 21\.1998\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
-R #\d+ 21\.1998\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
-R #\d+ 21\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
-R #\d+ 21\.2008\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
-R #\d+ 21\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
-R #\d+ 23\.6398\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.2 wlan0
-R #\d+ 23\.7165\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*?
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*?
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.2 wlan0 .*?
\+R #\d+ 3\.1998\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
\+R #\d+ 3\.2008\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
\+R #\d+ 3\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
\+R #\d+ 3\.2008\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
\+R #\d+ 3\.2008\d+s AODVTest\.receiver 145\.236\.0\.5 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
\+R #\d+ 3\.2008\d+s AODVTest\.receiver 145\.236\.0\.5 145\.236\.0\.1/32 145\.236\.0\.3 wlan0 .*?
\+R #\d+ 3\.2014\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.5/32 145\.236\.0\.5 wlan0 .*?
\+R #\d+ 3\.2061\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.5/32 145\.236\.0\.3 wlan0 .*?
-R #\d+ 21\.1998\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
-R #\d+ 21\.1998\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
-R #\d+ 21\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*?
-R #\d+ 21\.2008\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
-R #\d+ 21\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*?
-R #\d+ 23\.6398\d+s AODVTest\.intermediateNodeC 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.2 wlan0 .*?
-R #\d+ 23\.7165\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*?
%#--------------------------------------------------------------------------------------------------------------
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true
%not-contains: test_undisposed.out
Expand Down
12 changes: 6 additions & 6 deletions tests/module/AODVSimpleTest.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ sim-time-limit = 100s

%#--------------------------------------------------------------------------------------------------------------
%contains-regex: results/General-0.rt
\+R #\d+ 3\.1987\d+s AODVTest\.intermediateNode 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\+R #\d+ 3\.2035\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.2035\d+s AODVTest\.receiver 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.2035\d+s AODVTest\.receiver 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.2061\d+s AODVTest\.intermediateNode 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2107\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1987\d+s AODVTest\.intermediateNode 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*
\+R #\d+ 3\.2035\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*
\+R #\d+ 3\.2035\d+s AODVTest\.receiver 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*
\+R #\d+ 3\.2035\d+s AODVTest\.receiver 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.2 wlan0 .*
\+R #\d+ 3\.2061\d+s AODVTest\.intermediateNode 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*
\+R #\d+ 3\.2107\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.2 wlan0 .*
%#--------------------------------------------------------------------------------------------------------------
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true
%not-contains: test_undisposed.out
Expand Down
32 changes: 16 additions & 16 deletions tests/module/AODVSimpleTest_2.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,22 +109,22 @@ snapshot-file = "${resultdir}/${configname}-${runnumber}.sna"
%#--------------------------------------------------------------------------------------------------------------
%contains-regex: results/General-0.rt
.*
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.1998\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.2 wlan0
\+R #\d+ 3\.2004\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.4/32 145\.236\.0\.4 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2008\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\+R #\d+ 3\.2041\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.4/32 145\.236\.0\.2 wlan0
\-R #\d+ 21\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0
\-R #\d+ 21\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\-R #\d+ 21\.2008\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\-R #\d+ 21\.2008\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0
\-R #\d+ 23\.7165\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.1 wlan0
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*
\+R #\d+ 3\.1965\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*
\+R #\d+ 3\.1998\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*
\+R #\d+ 3\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*
\+R #\d+ 3\.1998\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*
\+R #\d+ 3\.1998\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.1/32 145\.236\.0\.2 wlan0 .*
\+R #\d+ 3\.2004\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.4/32 145\.236\.0\.4 wlan0 .*
\+R #\d+ 3\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*
\+R #\d+ 3\.2008\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*
\+R #\d+ 3\.2008\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*
\+R #\d+ 3\.2041\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.4/32 145\.236\.0\.2 wlan0 .*
\-R #\d+ 21\.1998\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.2/32 145\.236\.0\.2 wlan0 .*
\-R #\d+ 21\.2008\d+s AODVTest\.intermediateNodeA 145\.236\.0\.2 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*
\-R #\d+ 21\.2008\d+s AODVTest\.sender 145\.236\.0\.1 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*
\-R #\d+ 21\.2008\d+s AODVTest\.receiver 145\.236\.0\.4 145\.236\.0\.3/32 145\.236\.0\.3 wlan0 .*
\-R #\d+ 23\.7165\d+s AODVTest\.intermediateNodeB 145\.236\.0\.3 145\.236\.0\.1/32 145\.236\.0\.1 wlan0 .*
%#--------------------------------------------------------------------------------------------------------------
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true
%not-contains: test_undisposed.out
Expand Down

0 comments on commit 7f61c52

Please sign in to comment.