Skip to content

Commit e1db4ca

Browse files
jparisujparisu
authored
Increase time of Docker Compose tests so it does not fail if discovery delays (#286)
Signed-off-by: jparisu <javierparis@eprosima.com> Signed-off-by: jparisu <javierparis@eprosima.com>
1 parent 45f8534 commit e1db4ca

5 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎ddsrouter_test/compose/discovery_server/compose.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ services:
3939
- cloud_edge_net
4040
volumes:
4141
- ./ddsrouter_cloud_discovery.yaml:/config.yaml
42-
command: ddsrouter -c /config.yaml --timeout 10
42+
command: ddsrouter -c /config.yaml --timeout 12
4343

4444
ddsrouter_edge_1:
4545
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -51,7 +51,7 @@ services:
5151
- edge_1_net
5252
volumes:
5353
- ./ddsrouter_edge_1.yaml:/config.yaml
54-
command: ddsrouter -c /config.yaml --timeout 10
54+
command: ddsrouter -c /config.yaml --timeout 12
5555

5656
pub_edge_1:
5757
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -60,7 +60,7 @@ services:
6060
- ddsrouter_edge_1
6161
networks:
6262
- edge_1_net
63-
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 200 -s 45 -d 1
63+
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 100 -s 110 -d 1
6464

6565
sub_edge_1:
6666
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -71,7 +71,7 @@ services:
7171
- edge_1_net
7272
volumes:
7373
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
74-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10 --domain 1
74+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --domain 1
7575

7676
ddsrouter_edge_2:
7777
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -83,7 +83,7 @@ services:
8383
- edge_2_net
8484
volumes:
8585
- ./ddsrouter_edge_2.yaml:/config.yaml
86-
command: ddsrouter -c /config.yaml --timeout 10
86+
command: ddsrouter -c /config.yaml --timeout 12
8787

8888
sub_edge_2:
8989
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -94,7 +94,7 @@ services:
9494
- edge_2_net
9595
volumes:
9696
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
97-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10 --domain 2
97+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --domain 2
9898

9999
networks:
100100
edge_1_net:

‎ddsrouter_test/compose/repeater/compose.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ services:
4545
- ddsrouter_cloud.edge_2
4646
volumes:
4747
- ./ddsrouter_cloud.yaml:/config.yaml
48-
command: ddsrouter -c /config.yaml --timeout 10
48+
command: ddsrouter -c /config.yaml --timeout 12
4949

5050
ddsrouter_edge_1:
5151
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -57,14 +57,14 @@ services:
5757
- edge_1_net
5858
volumes:
5959
- ./ddsrouter_edge_1.yaml:/config.yaml
60-
command: ddsrouter -c /config.yaml --timeout 10
60+
command: ddsrouter -c /config.yaml --timeout 12
6161

6262
pub_edge_1:
6363
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
6464
container_name: pub_edge_1
6565
networks:
6666
- edge_1_net
67-
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 200 -s 30
67+
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 100 -s 110
6868

6969
sub_edge_1:
7070
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -73,7 +73,7 @@ services:
7373
- edge_1_net
7474
volumes:
7575
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
76-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10
76+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12
7777

7878
ddsrouter_edge_2:
7979
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -85,7 +85,7 @@ services:
8585
- edge_2_net
8686
volumes:
8787
- ./ddsrouter_edge_2.yaml:/config.yaml
88-
command: ddsrouter -c /config.yaml --timeout 10
88+
command: ddsrouter -c /config.yaml --timeout 12
8989

9090
sub_edge_2:
9191
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -94,7 +94,7 @@ services:
9494
- edge_2_net
9595
volumes:
9696
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
97-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10
97+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12
9898

9999
networks:
100100
edge_1_net:

‎ddsrouter_test/compose/repeater_tcp/compose.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ services:
4141
- cloud_edge_net
4242
volumes:
4343
- ./ddsrouter_cloud.yaml:/config.yaml
44-
command: ddsrouter -c /config.yaml --timeout 10
44+
command: ddsrouter -c /config.yaml --timeout 12
4545

4646
ddsrouter_edge_1:
4747
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -53,7 +53,7 @@ services:
5353
- edge_1_net
5454
volumes:
5555
- ./ddsrouter_edge_1.yaml:/config.yaml
56-
command: ddsrouter -c /config.yaml --timeout 10
56+
command: ddsrouter -c /config.yaml --timeout 12
5757

5858
pub_edge_1:
5959
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -62,7 +62,7 @@ services:
6262
- ddsrouter_edge_1
6363
networks:
6464
- edge_1_net
65-
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 200 -s 45 -d 1
65+
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 100 -s 110 -d 1
6666

6767
sub_edge_1:
6868
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -73,7 +73,7 @@ services:
7373
- edge_1_net
7474
volumes:
7575
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
76-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10 --domain 1
76+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --domain 1
7777

7878
ddsrouter_edge_2:
7979
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -85,7 +85,7 @@ services:
8585
- edge_2_net
8686
volumes:
8787
- ./ddsrouter_edge_2.yaml:/config.yaml
88-
command: ddsrouter -c /config.yaml --timeout 10
88+
command: ddsrouter -c /config.yaml --timeout 12
8989

9090
sub_edge_2:
9191
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -96,7 +96,7 @@ services:
9696
- edge_2_net
9797
volumes:
9898
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
99-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10 --domain 2
99+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --domain 2
100100

101101
networks:
102102
edge_1_net:

‎ddsrouter_test/compose/tcp/compose.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040
- cloud_edge_net
4141
volumes:
4242
- ./ddsrouter_cloud.yaml:/config.yaml
43-
command: ddsrouter -c /config.yaml --timeout 10
43+
command: ddsrouter -c /config.yaml --timeout 12
4444

4545
ddsrouter_edge_1:
4646
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -52,7 +52,7 @@ services:
5252
- edge_1_net
5353
volumes:
5454
- ./ddsrouter_edge_1.yaml:/config.yaml
55-
command: ddsrouter -c /config.yaml --timeout 10
55+
command: ddsrouter -c /config.yaml --timeout 12
5656

5757
pub_edge_1:
5858
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -61,7 +61,7 @@ services:
6161
- ddsrouter_edge_1
6262
networks:
6363
- edge_1_net
64-
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 200 -s 45 -d 1
64+
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 100 -s 110 -d 1
6565

6666
sub_edge_1:
6767
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -72,7 +72,7 @@ services:
7272
- edge_1_net
7373
volumes:
7474
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
75-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10 --domain 1
75+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --domain 1
7676

7777
ddsrouter_edge_2:
7878
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -84,7 +84,7 @@ services:
8484
- edge_2_net
8585
volumes:
8686
- ./ddsrouter_edge_2.yaml:/config.yaml
87-
command: ddsrouter -c /config.yaml --timeout 10
87+
command: ddsrouter -c /config.yaml --timeout 12
8888

8989
sub_edge_2:
9090
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -95,7 +95,7 @@ services:
9595
- edge_2_net
9696
volumes:
9797
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
98-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10 --domain 2
98+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --domain 2
9999

100100
networks:
101101
edge_1_net:

‎ddsrouter_test/compose/udp/compose.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ services:
4141
- cloud_edge_net
4242
volumes:
4343
- ./ddsrouter_cloud_1.yaml:/config.yaml
44-
command: ddsrouter -c /config.yaml --timeout 10
44+
command: ddsrouter -c /config.yaml --timeout 12
4545

4646
ddsrouter_cloud_2:
4747
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -52,7 +52,7 @@ services:
5252
- cloud_edge_net
5353
volumes:
5454
- ./ddsrouter_cloud_2.yaml:/config.yaml
55-
command: ddsrouter -c /config.yaml --timeout 10
55+
command: ddsrouter -c /config.yaml --timeout 12
5656

5757
ddsrouter_edge_1:
5858
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -64,7 +64,7 @@ services:
6464
- edge_1_net
6565
volumes:
6666
- ./ddsrouter_edge_1.yaml:/config.yaml
67-
command: ddsrouter -c /config.yaml --timeout 10
67+
command: ddsrouter -c /config.yaml --timeout 12
6868

6969
pub_edge_1:
7070
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -73,7 +73,7 @@ services:
7373
- ddsrouter_edge_1
7474
networks:
7575
- edge_1_net
76-
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 200 -s 45 -d 1
76+
command: install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample publisher -i 100 -s 110 -d 1
7777

7878
sub_edge_1:
7979
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -84,7 +84,7 @@ services:
8484
- edge_1_net
8585
volumes:
8686
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
87-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10 --domain 1
87+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --domain 1
8888

8989
ddsrouter_edge_2:
9090
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -96,7 +96,7 @@ services:
9696
- edge_2_net
9797
volumes:
9898
- ./ddsrouter_edge_2.yaml:/config.yaml
99-
command: ddsrouter -c /config.yaml --timeout 10
99+
command: ddsrouter -c /config.yaml --timeout 12
100100

101101
sub_edge_2:
102102
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -107,7 +107,7 @@ services:
107107
- edge_2_net
108108
volumes:
109109
- ../execute_and_validate_subscriber.py:/execute_and_validate_subscriber.py
110-
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 10 --timeout 10 --domain 2
110+
command: python3 /execute_and_validate_subscriber.py --exe install/BasicConfigurationExample/examples/cpp/dds/BasicConfigurationExample/BasicConfigurationExample --samples 20 --timeout 12 --domain 2
111111

112112
networks:
113113
edge_1_net:

0 commit comments

Comments
 (0)