Skip to content

Commit dd633fb

Browse files
committed
test: fix unittests after version bumps
1 parent 5bfee04 commit dd633fb

File tree

1 file changed

+25
-19
lines changed

1 file changed

+25
-19
lines changed

t/tasks/netinventory.t

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ use FusionInventory::Agent::Target::Server;
1717
use FusionInventory::Agent::HTTP::Client::OCS;
1818
use FusionInventory::Agent::XML::Query::Prolog;
1919

20+
use FusionInventory::Agent::Version;
21+
use FusionInventory::Agent::Task::NetInventory::Version;
22+
23+
our $VERSION = $FusionInventory::Agent::Version::VERSION;
24+
our $TASKVERSION = FusionInventory::Agent::Task::NetInventory::Version::VERSION;
25+
2026
# check thread support availability
2127
if (!$Config{usethreads} || $Config{usethreads} ne 'define') {
2228
plan skip_all => 'thread support required';
@@ -134,10 +140,10 @@ my %responses = (
134140
<REQUEST>
135141
<CONTENT>
136142
<AGENT>
137-
<AGENTVERSION>2.4.2-dev</AGENTVERSION>
143+
<AGENTVERSION>'.$VERSION.'</AGENTVERSION>
138144
<START>1</START>
139145
</AGENT>
140-
<MODULEVERSION>3.0</MODULEVERSION>
146+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
141147
<PROCESSNUMBER>98030</PROCESSNUMBER>
142148
</CONTENT>
143149
<DEVICEID>normal_v2_case</DEVICEID>
@@ -155,7 +161,7 @@ my %responses = (
155161
<TYPE>NETWORKING</TYPE>
156162
</INFO>
157163
</DEVICE>
158-
<MODULEVERSION>3.0</MODULEVERSION>
164+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
159165
<PROCESSNUMBER>98030</PROCESSNUMBER>
160166
</CONTENT>
161167
<DEVICEID>normal_v2_case</DEVICEID>
@@ -168,7 +174,7 @@ my %responses = (
168174
<AGENT>
169175
<END>1</END>
170176
</AGENT>
171-
<MODULEVERSION>3.0</MODULEVERSION>
177+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
172178
<PROCESSNUMBER>98030</PROCESSNUMBER>
173179
</CONTENT>
174180
<DEVICEID>normal_v2_case</DEVICEID>
@@ -181,7 +187,7 @@ my %responses = (
181187
<AGENT>
182188
<END>1</END>
183189
</AGENT>
184-
<MODULEVERSION>3.0</MODULEVERSION>
190+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
185191
<PROCESSNUMBER>98030</PROCESSNUMBER>
186192
</CONTENT>
187193
<DEVICEID>normal_v2_case</DEVICEID>
@@ -192,10 +198,10 @@ my %responses = (
192198
<REQUEST>
193199
<CONTENT>
194200
<AGENT>
195-
<AGENTVERSION>2.4.2-dev</AGENTVERSION>
201+
<AGENTVERSION>'.$VERSION.'</AGENTVERSION>
196202
<START>1</START>
197203
</AGENT>
198-
<MODULEVERSION>3.0</MODULEVERSION>
204+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
199205
<PROCESSNUMBER>98031</PROCESSNUMBER>
200206
</CONTENT>
201207
<DEVICEID>normal_v2_case</DEVICEID>
@@ -215,7 +221,7 @@ my %responses = (
215221
<TYPE>NETWORKING</TYPE>
216222
</INFO>
217223
</DEVICE>
218-
<MODULEVERSION>3.0</MODULEVERSION>
224+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
219225
<PROCESSNUMBER>98031</PROCESSNUMBER>
220226
</CONTENT>
221227
<DEVICEID>normal_v2_case</DEVICEID>
@@ -228,7 +234,7 @@ my %responses = (
228234
<AGENT>
229235
<END>1</END>
230236
</AGENT>
231-
<MODULEVERSION>3.0</MODULEVERSION>
237+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
232238
<PROCESSNUMBER>98031</PROCESSNUMBER>
233239
</CONTENT>
234240
<DEVICEID>normal_v2_case</DEVICEID>
@@ -241,7 +247,7 @@ my %responses = (
241247
<AGENT>
242248
<END>1</END>
243249
</AGENT>
244-
<MODULEVERSION>3.0</MODULEVERSION>
250+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
245251
<PROCESSNUMBER>98031</PROCESSNUMBER>
246252
</CONTENT>
247253
<DEVICEID>normal_v2_case</DEVICEID>
@@ -274,10 +280,10 @@ my %responses = (
274280
<REQUEST>
275281
<CONTENT>
276282
<AGENT>
277-
<AGENTVERSION>2.4.2-dev</AGENTVERSION>
283+
<AGENTVERSION>'.$VERSION.'</AGENTVERSION>
278284
<START>1</START>
279285
</AGENT>
280-
<MODULEVERSION>3.0</MODULEVERSION>
286+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
281287
<PROCESSNUMBER>98030</PROCESSNUMBER>
282288
</CONTENT>
283289
<DEVICEID>error_v2_case</DEVICEID>
@@ -294,7 +300,7 @@ my %responses = (
294300
<TYPE>NETWORKING</TYPE>
295301
</ERROR>
296302
</DEVICE>
297-
<MODULEVERSION>3.0</MODULEVERSION>
303+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
298304
<PROCESSNUMBER>98030</PROCESSNUMBER>
299305
</CONTENT>
300306
<DEVICEID>error_v2_case</DEVICEID>
@@ -307,7 +313,7 @@ my %responses = (
307313
<AGENT>
308314
<END>1</END>
309315
</AGENT>
310-
<MODULEVERSION>3.0</MODULEVERSION>
316+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
311317
<PROCESSNUMBER>98030</PROCESSNUMBER>
312318
</CONTENT>
313319
<DEVICEID>error_v2_case</DEVICEID>
@@ -320,7 +326,7 @@ my %responses = (
320326
<AGENT>
321327
<END>1</END>
322328
</AGENT>
323-
<MODULEVERSION>3.0</MODULEVERSION>
329+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
324330
<PROCESSNUMBER>98030</PROCESSNUMBER>
325331
</CONTENT>
326332
<DEVICEID>error_v2_case</DEVICEID>
@@ -372,7 +378,7 @@ my %responses = (
372378
<TYPE>NETWORKING</TYPE>
373379
</INFO>
374380
</DEVICE>
375-
<MODULEVERSION>3.0</MODULEVERSION>
381+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
376382
<PROCESSNUMBER>98030</PROCESSNUMBER>
377383
</CONTENT>
378384
<DEVICEID>normal_v3_case</DEVICEID>
@@ -392,7 +398,7 @@ my %responses = (
392398
<TYPE>NETWORKING</TYPE>
393399
</INFO>
394400
</DEVICE>
395-
<MODULEVERSION>3.0</MODULEVERSION>
401+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
396402
<PROCESSNUMBER>98031</PROCESSNUMBER>
397403
</CONTENT>
398404
<DEVICEID>normal_v3_case</DEVICEID>
@@ -419,7 +425,7 @@ my %responses = (
419425
</PORT>
420426
</PORTS>
421427
</DEVICE>
422-
<MODULEVERSION>3.0</MODULEVERSION>
428+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
423429
<PROCESSNUMBER>98032</PROCESSNUMBER>
424430
</CONTENT>
425431
<DEVICEID>normal_v3_case</DEVICEID>
@@ -460,7 +466,7 @@ my %responses = (
460466
<TYPE>NETWORKING</TYPE>
461467
</ERROR>
462468
</DEVICE>
463-
<MODULEVERSION>3.0</MODULEVERSION>
469+
<MODULEVERSION>'.$TASKVERSION.'</MODULEVERSION>
464470
<PROCESSNUMBER>98037</PROCESSNUMBER>
465471
</CONTENT>
466472
<DEVICEID>error_v3_case</DEVICEID>

0 commit comments

Comments
 (0)