Skip to content

Commit ceef68d

Browse files
ZoltanBojtheZoltanBojthe
committed
tests: module: Followed event banner omnetpp changes
1 parent d204e7c commit ceef68d

4 files changed

Lines changed: 44 additions & 44 deletions

File tree

‎tests/module/EtherHost_lifecycle.test‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ network Test
9797
Generating packet `req-\d+-\d+'
9898
%#--------------------------------------------------------------------------------------------------------------
9999
%contains-regex: stdout
100-
\*\* Event #\d+ t=2 Test\.scenarioManager \(ScenarioManager, id=\d+\)
100+
\*\* Event #\d+ t=2 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
101101
processing <startup> command\.\.\.
102102
Doing stage 0/8 of operation inet::ModuleStartOperation on Test\.sender\[0\]
103103
Test\.sender\[0\] starting up
@@ -115,65 +115,65 @@ Test\.sender\[0\] started
115115
\*\* Event #\d+ t=
116116
%#--------------------------------------------------------------------------------------------------------------
117117
%contains-regex: stdout
118-
\*\* Event \#\d+ t=2 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
118+
\*\* Event \#\d+ t=2 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
119119
Test\.sender\[0\]\.cli registering DSAP 240
120120
Sending message, .*\(Request\).*LLC_OPEN.*\.
121121
Generating packet `req-\d+-1'
122122
%#--------------------------------------------------------------------------------------------------------------
123123
%contains-regex: stdout
124-
\*\* Event \#\d+ t=2\.5 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
124+
\*\* Event \#\d+ t=2\.5 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
125125
Generating packet `req-\d+-2'
126126
%#--------------------------------------------------------------------------------------------------------------
127127
%contains-regex: stdout
128-
\*\* Event \#\d+ t=3 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
128+
\*\* Event \#\d+ t=3 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
129129
Generating packet `req-\d+-3'
130130
%#--------------------------------------------------------------------------------------------------------------
131131
%contains-regex: stdout
132-
\*\* Event \#\d+ t=3\.5 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
132+
\*\* Event \#\d+ t=3\.5 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
133133
Generating packet `req-\d+-4'
134134
%#--------------------------------------------------------------------------------------------------------------
135135
%contains-regex: stdout
136-
\*\* Event \#\d+ t=4 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
136+
\*\* Event \#\d+ t=4 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
137137
Generating packet `req-\d+-5'
138138
%#--------------------------------------------------------------------------------------------------------------
139139
%contains-regex: stdout
140-
\*\* Event \#\d+ t=4\.5 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
140+
\*\* Event \#\d+ t=4\.5 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
141141
Generating packet `req-\d+-6'
142142
%#--------------------------------------------------------------------------------------------------------------
143143
%contains-regex: stdout
144-
\*\* Event \#\d+ t=5 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
144+
\*\* Event \#\d+ t=5 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
145145
Generating packet `req-\d+-7'
146146
%#--------------------------------------------------------------------------------------------------------------
147147
%contains-regex: stdout
148-
\*\* Event \#\d+ t=5\.5 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
148+
\*\* Event \#\d+ t=5\.5 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
149149
Generating packet `req-\d+-8'
150150
%#--------------------------------------------------------------------------------------------------------------
151151
%contains-regex: stdout
152-
\*\* Event \#\d+ t=6 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
152+
\*\* Event \#\d+ t=6 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
153153
Generating packet `req-\d+-9'
154154
%#--------------------------------------------------------------------------------------------------------------
155155
%contains-regex: stdout
156-
\*\* Event \#\d+ t=6\.5 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
156+
\*\* Event \#\d+ t=6\.5 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
157157
Generating packet `req-\d+-10'
158158
%#--------------------------------------------------------------------------------------------------------------
159159
%contains-regex: stdout
160-
\*\* Event \#\d+ t=7 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
160+
\*\* Event \#\d+ t=7 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
161161
Generating packet `req-\d+-11'
162162
%#--------------------------------------------------------------------------------------------------------------
163163
%contains-regex: stdout
164-
\*\* Event \#\d+ t=7\.5 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
164+
\*\* Event \#\d+ t=7\.5 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
165165
Generating packet `req-\d+-12'
166166
%#--------------------------------------------------------------------------------------------------------------
167167
%contains-regex: stdout
168-
\*\* Event \#\d+ t=8 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
168+
\*\* Event \#\d+ t=8 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
169169
Generating packet `req-\d+-13'
170170
%#--------------------------------------------------------------------------------------------------------------
171171
%contains-regex: stdout
172-
\*\* Event \#\d+ t=8\.5 Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
172+
\*\* Event \#\d+ t=8\.5 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
173173
Generating packet `req-\d+-14'
174174
%#--------------------------------------------------------------------------------------------------------------
175175
%contains-regex: stdout
176-
\*\* Event #\d+ t=9 Test\.scenarioManager \(ScenarioManager, id=\d+\)
176+
\*\* Event #\d+ t=9 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
177177
processing <shutdown> command\.\.\.
178178
Doing stage 0/8 of operation inet::ModuleStopOperation on Test.sender\[0\]
179179
Test\.sender\[0\] shutting down
@@ -190,48 +190,48 @@ Doing stage 7/8 of operation inet::ModuleStopOperation on Test\.sender\[0\]
190190
Test\.sender\[0\] shut down
191191
%#--------------------------------------------------------------------------------------------------------------
192192
%not-contains-regex: stdout
193-
\*\* Event \#\d+ t=9(\.d+)? Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
193+
\*\* Event \#\d+ t=9(\.d+)? on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[0\]\.cli \(EtherAppClient, id=\d+\)
194194
Generating packet `req-\d+-\d+'
195195
%#--------------------------------------------------------------------------------------------------------------
196196
%#--------------------------------------------------------------------------------------------------------------
197197
%# sender[1]
198198
%#--------------------------------------------------------------------------------------------------------------
199199
%contains-regex: stdout
200-
\*\* Event \#\d+ t=1\.1 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
200+
\*\* Event \#\d+ t=1\.1 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
201201
Test\.sender\[1\]\.cli registering DSAP 240
202202
Sending message, .*\(Request\).*LLC_OPEN.*\.
203203
Generating packet `req-\d+-1'
204204
%#--------------------------------------------------------------------------------------------------------------
205205
%contains-regex: stdout
206-
\*\* Event \#\d+ t=1\.6 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
206+
\*\* Event \#\d+ t=1\.6 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
207207
Generating packet `req-\d+-2'
208208
%#--------------------------------------------------------------------------------------------------------------
209209
%contains-regex: stdout
210-
\*\* Event \#\d+ t=2\.1 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
210+
\*\* Event \#\d+ t=2\.1 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
211211
Generating packet `req-\d+-3'
212212
%#--------------------------------------------------------------------------------------------------------------
213213
%contains-regex: stdout
214-
\*\* Event \#\d+ t=2\.6 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
214+
\*\* Event \#\d+ t=2\.6 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
215215
Generating packet `req-\d+-4'
216216
%#--------------------------------------------------------------------------------------------------------------
217217
%contains-regex: stdout
218-
\*\* Event \#\d+ t=3\.1 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
218+
\*\* Event \#\d+ t=3\.1 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
219219
Generating packet `req-\d+-5'
220220
%#--------------------------------------------------------------------------------------------------------------
221221
%contains-regex: stdout
222-
\*\* Event \#\d+ t=3\.6 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
222+
\*\* Event \#\d+ t=3\.6 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
223223
Generating packet `req-\d+-6'
224224
%#--------------------------------------------------------------------------------------------------------------
225225
%contains-regex: stdout
226-
\*\* Event \#\d+ t=4\.1 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
226+
\*\* Event \#\d+ t=4\.1 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
227227
Generating packet `req-\d+-7'
228228
%#--------------------------------------------------------------------------------------------------------------
229229
%contains-regex: stdout
230-
\*\* Event \#\d+ t=4\.6 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
230+
\*\* Event \#\d+ t=4\.6 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
231231
Generating packet `req-\d+-8'
232232
%#--------------------------------------------------------------------------------------------------------------
233233
%contains-regex: stdout
234-
\*\* Event #\d+ t=5\.1 Test\.scenarioManager \(ScenarioManager, id=\d+\)
234+
\*\* Event #\d+ t=5\.1 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
235235
processing <shutdown> command\.\.\.
236236
Doing stage 0/8 of operation inet::ModuleStopOperation on Test.sender\[1\]
237237
Test\.sender\[1\] shutting down
@@ -248,11 +248,11 @@ Doing stage 7/8 of operation inet::ModuleStopOperation on Test\.sender\[1\]
248248
Test\.sender\[1\] shut down
249249
%#--------------------------------------------------------------------------------------------------------------
250250
%not-contains-regex: stdout
251-
\*\* Event \#\d+ t=5(\.d+)? Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
251+
\*\* Event \#\d+ t=5(\.d+)? on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
252252
Generating packet `req-\d+-\d+'
253253
%#--------------------------------------------------------------------------------------------------------------
254254
%contains-regex: stdout
255-
\*\* Event #\d+ t=6\.1 Test\.scenarioManager \(ScenarioManager, id=\d+\)
255+
\*\* Event #\d+ t=6\.1 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
256256
processing <startup> command\.\.\.
257257
Doing stage 0/8 of operation inet::ModuleStartOperation on Test\.sender\[1\]
258258
Test\.sender\[1\] starting up
@@ -270,33 +270,33 @@ Test.sender\[1\] started
270270
\*\* Event #\d+ t=
271271
%#--------------------------------------------------------------------------------------------------------------
272272
%contains-regex: stdout
273-
\*\* Event \#\d+ t=6\.1 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
273+
\*\* Event \#\d+ t=6\.1 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
274274
Test\.sender\[1\]\.cli registering DSAP 240
275275
Sending message, .*\(Request\).*LLC_OPEN.*\.
276276
Generating packet `req-\d+-9'
277277
%#--------------------------------------------------------------------------------------------------------------
278278
%contains-regex: stdout
279-
\*\* Event \#\d+ t=6\.6 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
279+
\*\* Event \#\d+ t=6\.6 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
280280
Generating packet `req-\d+-10'
281281
%#--------------------------------------------------------------------------------------------------------------
282282
%contains-regex: stdout
283-
\*\* Event \#\d+ t=7\.1 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
283+
\*\* Event \#\d+ t=7\.1 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
284284
Generating packet `req-\d+-11'
285285
%#--------------------------------------------------------------------------------------------------------------
286286
%contains-regex: stdout
287-
\*\* Event \#\d+ t=7\.6 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
287+
\*\* Event \#\d+ t=7\.6 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
288288
Generating packet `req-\d+-12'
289289
%#--------------------------------------------------------------------------------------------------------------
290290
%contains-regex: stdout
291-
\*\* Event \#\d+ t=8\.1 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
291+
\*\* Event \#\d+ t=8\.1 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
292292
Generating packet `req-\d+-13'
293293
%#--------------------------------------------------------------------------------------------------------------
294294
%contains-regex: stdout
295-
\*\* Event \#\d+ t=8\.6 Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
295+
\*\* Event \#\d+ t=8\.6 on generateNextPacket \(omnetpp::cMessage\) in Test\.sender\[1\]\.cli \(EtherAppClient, id=\d+\)
296296
Generating packet `req-\d+-14'
297297
%#--------------------------------------------------------------------------------------------------------------
298298
%contains-regex: stdout
299-
\*\* Event #\d+ t=9\.1 Test\.scenarioManager \(ScenarioManager, id=\d+\)
299+
\*\* Event #\d+ t=9\.1 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
300300
processing <shutdown> command\.\.\.
301301
Doing stage 0/8 of operation inet::ModuleStopOperation on Test.sender\[1\]
302302
Test\.sender\[1\] shutting down
@@ -316,7 +316,7 @@ Test\.sender\[1\] shut down
316316
%# recip
317317
%#--------------------------------------------------------------------------------------------------------------
318318
%contains-regex: stdout
319-
\*\* Event #\d+ t=1\.7 Test\.scenarioManager \(ScenarioManager, id=\d+\)
319+
\*\* Event #\d+ t=1\.7 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
320320
processing <startup> command\.\.\.
321321
Doing stage 0/8 of operation inet::ModuleStartOperation on Test\.recip
322322
Test\.recip starting up
@@ -334,7 +334,7 @@ Test\.recip started
334334
\*\* Event #\d+ t=
335335
%#--------------------------------------------------------------------------------------------------------------
336336
%contains-regex: stdout
337-
\*\* Event #\d+ t=3\.2 Test\.scenarioManager \(ScenarioManager, id=\d+\)
337+
\*\* Event #\d+ t=3\.2 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
338338
processing <shutdown> command\.\.\.
339339
Doing stage 0/8 of operation inet::ModuleStopOperation on Test.recip
340340
Test\.recip shutting down
@@ -353,7 +353,7 @@ Test\.recip shut down
353353

354354
%#--------------------------------------------------------------------------------------------------------------
355355
%contains-regex: stdout
356-
\*\* Event #\d+ t=4\.2 Test\.scenarioManager \(ScenarioManager, id=\d+\)
356+
\*\* Event #\d+ t=4\.2 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
357357
processing <startup> command\.\.\.
358358
Doing stage 0/8 of operation inet::ModuleStartOperation on Test\.recip
359359
Test\.recip starting up
@@ -374,7 +374,7 @@ Test\.recip started
374374
%# switch
375375
%#--------------------------------------------------------------------------------------------------------------
376376
%contains-regex: stdout
377-
\*\* Event #\d+ t=7\.3 Test\.scenarioManager \(ScenarioManager, id=\d+\)
377+
\*\* Event #\d+ t=7\.3 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
378378
processing <shutdown> command\.\.\.
379379
Doing stage 0/8 of operation inet::ModuleStopOperation on Test.switch
380380
Test\.switch shutting down
@@ -389,7 +389,7 @@ Test\.switch shut down
389389
\*\* Event #\d+ t=
390390
%#--------------------------------------------------------------------------------------------------------------
391391
%contains-regex: stdout
392-
\*\* Event #\d+ t=8\.3 Test\.scenarioManager \(ScenarioManager, id=\d+\)
392+
\*\* Event #\d+ t=8\.3 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager \(ScenarioManager, id=\d+\)
393393
processing <startup> command\.\.\.
394394
Doing stage 0/8 of operation inet::ModuleStartOperation on Test\.switch
395395
Test\.switch starting up

‎tests/module/ExternalProcess_3.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ scheduler-class = "inet::RealTimeScheduler"
3131

3232
%#--------------------------------------------------------------------------------------------------------------
3333
%contains-regex: stdout
34-
\*\* Event #1 t=0 TestNetwork.externalProcess\[0\] \(ExternalProcess, id=2\)
34+
\*\* Event #1 t=0 on startTimer \(omnetpp::cMessage\) in TestNetwork.externalProcess\[0\] \(ExternalProcess, id=2\)
3535
Starting process: ping localhost
3636
PING localhost.*?
3737
64 bytes .*? icmp_seq=1 ttl=64 time=.*? ms
38-
\*\* Event #2 t=1 TestNetwork.externalProcess\[1\] \(ExternalProcess, id=3\)
38+
\*\* Event #2 t=1 on startTimer \(omnetpp::cMessage\) in TestNetwork.externalProcess\[1\] \(ExternalProcess, id=3\)
3939
Starting process: killall ping
4040
(.*\n)*
4141
<!> External process finished -- in module \(inet::ExternalProcess\) TestNetwork.externalProcess\[0\] \(id=2\), at t=.*?, event #2

‎tests/module/ScenarioManager_disconnect_1.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ network Test
4444
%#--------------------------------------------------------------------------------------------------------------
4545
%contains-regex: stdout
4646
Running simulation...
47-
\*\* Event #1 t=1 Test.scenarioManager \(ScenarioManager, id=2\)
47+
\*\* Event #1 t=1 on scenario-event \(inet::ScenarioTimer\) in Test.scenarioManager \(ScenarioManager, id=2\)
4848
processing <at> command...
4949
processing <disconnect> command...
5050
Disconnecting Test.hostA.pppg\$o\[0\] --> Test.hostB.pppg\$i\[0\] and its reverse connection

‎tests/module/ScenarioManager_disconnect_2.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ network Test
6161
%#--------------------------------------------------------------------------------------------------------------
6262
%contains: stdout
6363
Running simulation...
64-
** Event #1 t=1 Test.scenarioManager (ScenarioManager, id=2)
64+
** Event #1 t=1 on scenario-event (inet::ScenarioTimer) in Test.scenarioManager (ScenarioManager, id=2)
6565
processing <at> command...
6666
processing <disconnect> command...
6767
Disconnecting Test.src.out --> Test.sink.in

0 commit comments

Comments
 (0)