-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Revert "Revert "Reconnection tests [12522]"" Signed-off-by: RaulSanchez <[email protected]> * Refs #12522: Add test for tool reconnection Signed-off-by: jparisu <[email protected]> * Refs #12522: Add client reconnect test Signed-off-by: jparisu <[email protected]> * Refs #12522: Uncomment SHM_ON Signed-off-by: jparisu <[email protected]> * Refs #12522: Set test 41 time longer for jenkins Signed-off-by: jparisu <[email protected]> * Refs #12522: Set test 42 time longer for jenkins Signed-off-by: jparisu <[email protected]> * Refs #12522: Set test 43 time longer for jenkins Signed-off-by: jparisu <[email protected]> * Refs #12522: Apply suggestions Signed-off-by: jparisu <[email protected]> * Refs #12522: Change 39 name number to 60 Signed-off-by: jparisu <[email protected]> * Refs #12522: Extend 39 test time Signed-off-by: jparisu <[email protected]> * Refs #12522: Delayed third snapshot and all steps after that one for test 50 Signed-off-by: Javier Santiago <[email protected]> Co-authored-by: jparisu <[email protected]> Co-authored-by: Javier Santiago <[email protected]>
- Loading branch information
3 people
authored
Nov 22, 2021
1 parent
dfa551b
commit 798f165
Showing
36 changed files
with
2,386 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
test/configuration/test_cases/test_39_trivial_reconnect_A.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <DS xmlns="http://www.eprosima.com/XMLSchemas/discovery-server" user_shutdown="false"> | ||
|
|
||
| <servers> | ||
| <server name="server" profile_name="UDP server A" /> | ||
| </servers> | ||
|
|
||
| <snapshots file="./test_39_trivial_reconnect_A.snapshot~"> | ||
| <snapshot time="2">Knows server B</snapshot> | ||
| <snapshot time="7">Do not know server B</snapshot> | ||
| <snapshot time="11">Knows server B</snapshot> | ||
| </snapshots> | ||
|
|
||
| <profiles> | ||
| <participant profile_name="UDP server A"> | ||
| <rtps> | ||
| <prefix>44.49.53.43.53.45.52.56.45.52.5F.31</prefix> | ||
| <builtin> | ||
| <discovery_config> | ||
| <discoveryProtocol>SERVER</discoveryProtocol> | ||
| <initialAnnouncements> | ||
| <count>0</count> | ||
| </initialAnnouncements> | ||
| <leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement> | ||
| <leaseDuration>DURATION_INFINITY</leaseDuration> | ||
| </discovery_config> | ||
| <metatrafficUnicastLocatorList> | ||
| <locator> | ||
| <udpv4> | ||
| <address>127.0.0.1</address> | ||
| <port>39811</port> | ||
| </udpv4> | ||
| </locator> | ||
| </metatrafficUnicastLocatorList> | ||
| </builtin> | ||
| </rtps> | ||
| </participant> | ||
|
|
||
| </profiles> | ||
| </DS> |
52 changes: 52 additions & 0 deletions
52
test/configuration/test_cases/test_39_trivial_reconnect_B.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <DS xmlns="http://www.eprosima.com/XMLSchemas/discovery-server" user_shutdown="false"> | ||
|
|
||
| <servers> | ||
| <server name="server" profile_name="UDP server B" /> | ||
| </servers> | ||
|
|
||
| <snapshots file="./test_39_trivial_reconnect_B.snapshot~"> | ||
| <snapshot time="2">Knows A</snapshot> | ||
| <snapshot time="5">Do not know A</snapshot> | ||
| </snapshots> | ||
|
|
||
| <profiles> | ||
|
|
||
| <participant profile_name="UDP server B"> | ||
| <rtps> | ||
| <prefix>44.49.53.43.53.45.52.56.45.52.5F.32</prefix> | ||
| <builtin> | ||
| <discovery_config> | ||
| <discoveryProtocol>SERVER</discoveryProtocol> | ||
| <discoveryServersList> | ||
| <RemoteServer prefix="44.49.53.43.53.45.52.56.45.52.5F.31"> | ||
| <metatrafficUnicastLocatorList> | ||
| <locator> | ||
| <udpv4> | ||
| <address>127.0.0.1</address> | ||
| <port>39811</port> | ||
| </udpv4> | ||
| </locator> | ||
| </metatrafficUnicastLocatorList> | ||
| </RemoteServer> | ||
| </discoveryServersList> | ||
| <initialAnnouncements> | ||
| <count>0</count> | ||
| </initialAnnouncements> | ||
| <leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement> | ||
| <leaseDuration>DURATION_INFINITY</leaseDuration> | ||
| </discovery_config> | ||
| <metatrafficUnicastLocatorList> | ||
| <locator> | ||
| <udpv4> | ||
| <address>127.0.0.1</address> | ||
| <port>39812</port> | ||
| </udpv4> | ||
| </locator> | ||
| </metatrafficUnicastLocatorList> | ||
| </builtin> | ||
| </rtps> | ||
| </participant> | ||
|
|
||
| </profiles> | ||
| </DS> |
52 changes: 52 additions & 0 deletions
52
test/configuration/test_cases/test_40_trivial_server_reconnect_A.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <DS xmlns="http://www.eprosima.com/XMLSchemas/discovery-server" user_shutdown="false"> | ||
|
|
||
| <servers> | ||
| <server name="server" profile_name="UDP server A" /> | ||
| </servers> | ||
|
|
||
| <snapshots file="./test_40_trivial_server_reconnect_A.snapshot~"> | ||
| <snapshot time="2">Knows server B</snapshot> | ||
| <snapshot time="7">Do not know server B</snapshot> | ||
| <snapshot time="11">Knows server B</snapshot> | ||
| </snapshots> | ||
|
|
||
| <profiles> | ||
| <participant profile_name="UDP server A"> | ||
| <rtps> | ||
| <prefix>44.49.53.43.53.45.52.56.45.52.5F.31</prefix> | ||
| <builtin> | ||
| <discovery_config> | ||
| <discoveryProtocol>SERVER</discoveryProtocol> | ||
| <discoveryServersList> | ||
| <RemoteServer prefix="44.49.53.43.53.45.52.56.45.52.5F.32"> | ||
| <metatrafficUnicastLocatorList> | ||
| <locator> | ||
| <udpv4> | ||
| <address>127.0.0.1</address> | ||
| <port>40812</port> | ||
| </udpv4> | ||
| </locator> | ||
| </metatrafficUnicastLocatorList> | ||
| </RemoteServer> | ||
| </discoveryServersList> | ||
| <initialAnnouncements> | ||
| <count>0</count> | ||
| </initialAnnouncements> | ||
| <leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement> | ||
| <leaseDuration>DURATION_INFINITY</leaseDuration> | ||
| </discovery_config> | ||
| <metatrafficUnicastLocatorList> | ||
| <locator> | ||
| <udpv4> | ||
| <address>127.0.0.1</address> | ||
| <port>40811</port> | ||
| </udpv4> | ||
| </locator> | ||
| </metatrafficUnicastLocatorList> | ||
| </builtin> | ||
| </rtps> | ||
| </participant> | ||
|
|
||
| </profiles> | ||
| </DS> |
40 changes: 40 additions & 0 deletions
40
test/configuration/test_cases/test_40_trivial_server_reconnect_B.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <DS xmlns="http://www.eprosima.com/XMLSchemas/discovery-server" user_shutdown="false"> | ||
|
|
||
| <servers> | ||
| <server name="server" profile_name="UDP server B" /> | ||
| </servers> | ||
|
|
||
| <snapshots file="./test_40_trivial_server_reconnect_B.snapshot~"> | ||
| <snapshot time="3">Knows A</snapshot> | ||
| <snapshot time="5">Do not know A</snapshot> | ||
| </snapshots> | ||
|
|
||
| <profiles> | ||
|
|
||
| <participant profile_name="UDP server B"> | ||
| <rtps> | ||
| <prefix>44.49.53.43.53.45.52.56.45.52.5F.32</prefix> | ||
| <builtin> | ||
| <discovery_config> | ||
| <discoveryProtocol>SERVER</discoveryProtocol> | ||
| <initialAnnouncements> | ||
| <count>0</count> | ||
| </initialAnnouncements> | ||
| <leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement> | ||
| <leaseDuration>DURATION_INFINITY</leaseDuration> | ||
| </discovery_config> | ||
| <metatrafficUnicastLocatorList> | ||
| <locator> | ||
| <udpv4> | ||
| <address>127.0.0.1</address> | ||
| <port>40812</port> | ||
| </udpv4> | ||
| </locator> | ||
| </metatrafficUnicastLocatorList> | ||
| </builtin> | ||
| </rtps> | ||
| </participant> | ||
|
|
||
| </profiles> | ||
| </DS> |
89 changes: 89 additions & 0 deletions
89
test/configuration/test_cases/test_41_reconnect_with_clients_A.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <DS xmlns="http://www.eprosima.com/XMLSchemas/discovery-server" user_shutdown="false"> | ||
|
|
||
| <servers> | ||
| <server name="server" profile_name="UDP server A" /> | ||
| </servers> | ||
|
|
||
| <clients> | ||
| <client name="client1" profile_name="UDP_client1_serverA"> | ||
| <publisher topic="topic1"/> | ||
| </client> | ||
| </clients> | ||
|
|
||
| <snapshots file="./test_41_reconnect_with_clients_A.snapshot~"> | ||
| <snapshot time="2">Knows server B, client A and client B</snapshot> | ||
| <snapshot time="12">Do not know server B</snapshot> | ||
| <snapshot time="18">Knows server B, client A and client B</snapshot> | ||
| </snapshots> | ||
|
|
||
| <profiles> | ||
|
|
||
| <participant profile_name="UDP_client1_serverA" > | ||
| <rtps> | ||
| <prefix>63.6c.69.65.6e.74.31.5f.73.31.5f.5f</prefix> | ||
| <builtin> | ||
| <discovery_config> | ||
| <discoveryProtocol>CLIENT</discoveryProtocol> | ||
| <discoveryServersList> | ||
| <RemoteServer prefix="44.49.53.43.53.45.52.56.45.52.5F.31"> | ||
| <metatrafficUnicastLocatorList> | ||
| <locator> | ||
| <udpv4> | ||
| <address>127.0.0.1</address> | ||
| <port>41811</port> | ||
| </udpv4> | ||
| </locator> | ||
| </metatrafficUnicastLocatorList> | ||
| </RemoteServer> | ||
| </discoveryServersList> | ||
| <initialAnnouncements> | ||
| <count>0</count> | ||
| </initialAnnouncements> | ||
| <leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement> | ||
| <leaseDuration>DURATION_INFINITY</leaseDuration> | ||
| </discovery_config> | ||
| </builtin> | ||
| </rtps> | ||
| </participant> | ||
|
|
||
| <participant profile_name="UDP server A"> | ||
| <rtps> | ||
| <prefix>44.49.53.43.53.45.52.56.45.52.5F.31</prefix> | ||
| <builtin> | ||
| <discovery_config> | ||
| <discoveryProtocol>SERVER</discoveryProtocol> | ||
| <initialAnnouncements> | ||
| <count>0</count> | ||
| </initialAnnouncements> | ||
| <leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement> | ||
| <leaseDuration>DURATION_INFINITY</leaseDuration> | ||
| </discovery_config> | ||
| <metatrafficUnicastLocatorList> | ||
| <locator> | ||
| <udpv4> | ||
| <address>127.0.0.1</address> | ||
| <port>41811</port> | ||
| </udpv4> | ||
| </locator> | ||
| </metatrafficUnicastLocatorList> | ||
| </builtin> | ||
| </rtps> | ||
| </participant> | ||
|
|
||
| <topic profile_name="topic1"> | ||
| <name>topic_1</name> | ||
| <dataType>sample_type_1</dataType> | ||
| </topic> | ||
|
|
||
| <types> | ||
| <type> | ||
| <struct name="sample_type_1"> | ||
| <member name="index" type="uint32" /> | ||
| <member name="message" type="string" /> | ||
| </struct> | ||
| </type> | ||
| </types> | ||
|
|
||
| </profiles> | ||
| </DS> |
Oops, something went wrong.