Skip to content

Commit d70b649

Browse files
committed
Ensure tests are using different ports.
This avoids some tests to fail because, depending on the ordering, they are trying to connect to the same port. Motivated by S415-009.
1 parent 1966465 commit d70b649

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

regtests/0266_type_constraints/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
exec_cmd('ada2wsdl',
55
['-q', '-f', '-Ptcons_main',
6-
'-a', 'http://localhost:7701', 'tcons.ads', '-o', 'tcons.wsdl'])
6+
'-a', 'http://localhost:7720', 'tcons.ads', '-o', 'tcons.wsdl'])
77
exec_cmd('wsdl2aws',
88
['-q', '-f', '-cb', '-types', 'tcons', 'tcons.wsdl'])
99

regtests/0300_wsdl_pck_name/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exec_cmd('ada2wsdl',
44
['-q', '-f', '-Pwsdl_types_pck_main',
55
'-s', 'wsdl_types_pck',
6-
'-a', 'http://localhost:7701', 'types.ads',
6+
'-a', 'http://localhost:7717', 'types.ads',
77
'-o', 'wsdl_types_pck.wsdl'])
88
exec_cmd('wsdl2aws',
99
['-q', '-f', '-cb', '-types', 'types', 'wsdl_types_pck.wsdl'])

regtests/0303_ada2wsdl_dir/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exec_cmd('ada2wsdl',
44
['-q', '-f', '-Pwsdl_1b_main',
5-
'-a', 'http://localhost:7701', 'src/wsdl_1b.ads',
5+
'-a', 'http://localhost:7716', 'src/wsdl_1b.ads',
66
'-o', 'wsdl_1b.wsdl'])
77
exec_cmd('wsdl2aws',
88
['-q', '-f', '-cb', '-types', 'wsdl_1b', 'wsdl_1b.wsdl'])

regtests/0304_ada2wsdl_new_type/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exec_cmd('ada2wsdl',
44
['-q', '-f', '-Pwsdl_nt_main',
5-
'-a', 'http://localhost:7701', 'src/wsdl_nt.ads',
5+
'-a', 'http://localhost:7718', 'src/wsdl_nt.ads',
66
'-o', 'wsdl_nt.wsdl'])
77
exec_cmd('wsdl2aws',
88
['-q', '-f', '-cb', '-types', 'wsdl_nt_types', 'wsdl_nt.wsdl'])

regtests/0305_ada2wsdl_new_type/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exec_cmd('ada2wsdl',
44
['-q', '-f', '-Pwsdl_ntr_main',
5-
'-a', 'http://localhost:7701', 'src/wsdl_ntr.ads',
5+
'-a', 'http://localhost:7714', 'src/wsdl_ntr.ads',
66
'-o', 'wsdl_ntr.wsdl'])
77
exec_cmd('wsdl2aws',
88
['-q', '-f', '-cb', '-types', 'wsdl_ntr_types', 'wsdl_ntr.wsdl'])

regtests/0306_int_constraints/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
exec_cmd('ada2wsdl',
55
['-q', '-f', '-Ptcons2_main',
6-
'-a', 'http://localhost:7701', 'tcons2.ads', '-o', 'tcons2.wsdl'])
6+
'-a', 'http://localhost:7715', 'tcons2.ads', '-o', 'tcons2.wsdl'])
77
exec_cmd('wsdl2aws',
88
['-q', '-f', '-cb', '-types', 'tcons2', 'tcons2.wsdl'])
99

regtests/0324_wsdl_duration/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exec_cmd('ada2wsdl',
44
['-q', '-f', '-Pwsdl_d_main',
5-
'-a', 'http://localhost:7701', 'wsdl_d.ads', '-o', 'wsdl_d.wsdl'])
5+
'-a', 'http://localhost:7719', 'wsdl_d.ads', '-o', 'wsdl_d.wsdl'])
66
exec_cmd('wsdl2aws',
77
['-q', '-f', '-cb', '-types', 'wsdl_d', 'wsdl_d.wsdl'])
88

regtests/0324_wsdl_duration/wsdl_d_main.adb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
------------------------------------------------------------------------------
22
-- Ada Web Server --
33
-- --
4-
-- Copyright (C) 2019, AdaCore --
4+
-- Copyright (C) 2019-2020, AdaCore --
55
-- --
66
-- This is free software; you can redistribute it and/or modify it --
77
-- under terms of the GNU General Public License as published by the --
@@ -27,6 +27,7 @@ with WSDL_D;
2727

2828
with WSDL_D_Server;
2929
with WSDL_D_Service.Client;
30+
with WSDL_D_Service.Server;
3031

3132
procedure WSDL_D_Main is
3233

@@ -46,7 +47,7 @@ begin
4647
Schema => WSDL_D_Service.Schema);
4748

4849
Config.Set.Server_Host (Conf, "localhost");
49-
Config.Set.Server_Port (Conf, 7701);
50+
Config.Set.Server_Port (Conf, WSDL_D_Service.Server.Port);
5051

5152
Server.Start (WS, H, Conf);
5253

0 commit comments

Comments
 (0)