Skip to content

Commit 9ce94c7

Browse files
committed
Refs #20629: Update Backup tests with mesh topology
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
1 parent 4f9cb6a commit 9ce94c7

4 files changed

Lines changed: 322 additions & 300 deletions

File tree

test/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ set(TEST_CASE_LIST)
135135

136136
# Test that are leaky and may fail
137137
set(FAIL_TEST_CASES
138-
test_26_backup_restore
139-
test_33_superclient_complex)
138+
test_26_backup_restore)
140139

141140
# For each test case, create different executables for each configuration
142141
foreach(TEST IN LISTS TEST_LIST)

test/configuration/test_cases/test_33_superclient_complex.xml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@
8585
<initialAnnouncements>
8686
<count>0</count>
8787
</initialAnnouncements>
88-
<leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement>
88+
<leaseAnnouncement>
89+
<nanosec>500000000</nanosec>
90+
</leaseAnnouncement>
8991
<leaseDuration>DURATION_INFINITY</leaseDuration>
9092
</discovery_config>
9193
</builtin>
@@ -115,7 +117,9 @@
115117
<initialAnnouncements>
116118
<count>0</count>
117119
</initialAnnouncements>
118-
<leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement>
120+
<leaseAnnouncement>
121+
<nanosec>500000000</nanosec>
122+
</leaseAnnouncement>
119123
<leaseDuration>DURATION_INFINITY</leaseDuration>
120124
</discovery_config>
121125
</builtin>
@@ -139,7 +143,9 @@
139143
<initialAnnouncements>
140144
<count>0</count>
141145
</initialAnnouncements>
142-
<leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement>
146+
<leaseAnnouncement>
147+
<nanosec>500000000</nanosec>
148+
</leaseAnnouncement>
143149
<leaseDuration>DURATION_INFINITY</leaseDuration>
144150
</discovery_config>
145151
</builtin>
@@ -163,7 +169,9 @@
163169
<initialAnnouncements>
164170
<count>0</count>
165171
</initialAnnouncements>
166-
<leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement>
172+
<leaseAnnouncement>
173+
<nanosec>500000000</nanosec>
174+
</leaseAnnouncement>
167175
<leaseDuration>DURATION_INFINITY</leaseDuration>
168176
</discovery_config>
169177
</builtin>
@@ -188,7 +196,9 @@
188196
<initialAnnouncements>
189197
<count>0</count>
190198
</initialAnnouncements>
191-
<leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement>
199+
<leaseAnnouncement>
200+
<nanosec>500000000</nanosec>
201+
</leaseAnnouncement>
192202
<leaseDuration>DURATION_INFINITY</leaseDuration>
193203
</discovery_config>
194204
</builtin>
@@ -212,7 +222,9 @@
212222
<initialAnnouncements>
213223
<count>0</count>
214224
</initialAnnouncements>
215-
<leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement>
225+
<leaseAnnouncement>
226+
<nanosec>500000000</nanosec>
227+
</leaseAnnouncement>
216228
<leaseDuration>DURATION_INFINITY</leaseDuration>
217229
</discovery_config>
218230
</builtin>
@@ -236,7 +248,9 @@
236248
<initialAnnouncements>
237249
<count>0</count>
238250
</initialAnnouncements>
239-
<leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement>
251+
<leaseAnnouncement>
252+
<nanosec>500000000</nanosec>
253+
</leaseAnnouncement>
240254
<leaseDuration>DURATION_INFINITY</leaseDuration>
241255
</discovery_config>
242256
</builtin>
@@ -266,7 +280,9 @@
266280
<initialAnnouncements>
267281
<count>0</count>
268282
</initialAnnouncements>
269-
<leaseAnnouncement>DURATION_INFINITY</leaseAnnouncement>
283+
<leaseAnnouncement>
284+
<nanosec>500000000</nanosec>
285+
</leaseAnnouncement>
270286
<leaseDuration>DURATION_INFINITY</leaseDuration>
271287
</discovery_config>
272288
</builtin>
@@ -355,7 +371,7 @@
355371
</udpv4>
356372
</locator>
357373
</discoveryServersList>
358-
<discoveryProtocol>BACKUP</discoveryProtocol>
374+
<discoveryProtocol>SERVER</discoveryProtocol>
359375
<initialAnnouncements>
360376
<count>5</count>
361377
</initialAnnouncements>

0 commit comments

Comments
 (0)