Skip to content

Commit 4813b4f

Browse files
chore(test): use rc10 for tests
Signed-off-by: Brooks Townsend <brooks@cosmonic.com> oops comment in thing
1 parent c19a3f6 commit 4813b4f

7 files changed

+45
-9
lines changed

test/docker-compose-e2e-multitenant.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838

3939
# Have hosts in two different accounts
4040
wasmcloud_east:
41-
image: wasmcloud/wasmcloud:0.78.0-rc9
41+
image: wasmcloud/wasmcloud:0.78.0-rc10
4242
depends_on:
4343
- nats-leaf-a
4444
deploy:
@@ -51,7 +51,7 @@ services:
5151
WASMCLOUD_CLUSTER_SEED: SCAOGJWX53TGI4233T6GAXWYWBIB5ZDGPTCO6ODJQYELS52YCQCBQSRPA4
5252
HOST_region: us-brooks-east
5353
wasmcloud_west:
54-
image: wasmcloud/wasmcloud:0.78.0-rc9
54+
image: wasmcloud/wasmcloud:0.78.0-rc10
5555
depends_on:
5656
- nats-leaf-b
5757
deploy:

test/docker-compose-e2e-upgrade.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
ports:
66
- 4222:4222
77
wasmcloud:
8-
image: wasmcloud/wasmcloud:0.78.0-rc9
8+
image: wasmcloud/wasmcloud:0.78.0-rc10
99
depends_on:
1010
- nats
1111
deploy:

test/docker-compose-e2e.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
- 4222:4222
77
# Have hosts in 3 different "regions"
88
wasmcloud_east:
9-
image: wasmcloud/wasmcloud:0.78.0-rc9
9+
image: wasmcloud/wasmcloud:0.78.0-rc10
1010
depends_on:
1111
- nats
1212
deploy:
@@ -18,7 +18,7 @@ services:
1818
WASMCLOUD_CLUSTER_SEED: SCAOGJWX53TGI4233T6GAXWYWBIB5ZDGPTCO6ODJQYELS52YCQCBQSRPA4
1919
HOST_region: us-brooks-east
2020
wasmcloud_west:
21-
image: wasmcloud/wasmcloud:0.78.0-rc9
21+
image: wasmcloud/wasmcloud:0.78.0-rc10
2222
depends_on:
2323
- nats
2424
deploy:
@@ -30,7 +30,7 @@ services:
3030
WASMCLOUD_CLUSTER_SEED: SCAOGJWX53TGI4233T6GAXWYWBIB5ZDGPTCO6ODJQYELS52YCQCBQSRPA4
3131
HOST_region: us-taylor-west
3232
wasmcloud_moon:
33-
image: wasmcloud/wasmcloud:0.78.0-rc9
33+
image: wasmcloud/wasmcloud:0.78.0-rc10
3434
depends_on:
3535
- nats
3636
deploy:

tests/e2e_multiple_hosts.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,13 @@ async fn test_no_requirements(client_info: &ClientInfo) {
141141
"wasmcloud.azurecr.io/httpserver:0.17.0",
142142
ExpectedCount::Exactly(1),
143143
)?;
144+
145+
// Oh no a sleep! How horrible!
146+
// Actually, this is a good thing! If we reach this point because the httpserver
147+
// provider upgraded really quickly, that means we still have to wait 5 seconds
148+
// for the provider health check to trigger linkdef creation. So, after everything
149+
// gets created, give the linkdef scaler time to react to the provider health check.
150+
tokio::time::sleep(Duration::from_secs(5)).await;
144151
let links = client_info
145152
.ctl_client("default")
146153
.query_links()
@@ -334,6 +341,12 @@ async fn test_complex_app(client_info: &ClientInfo) {
334341
ExpectedCount::Exactly(1),
335342
)?;
336343

344+
// Oh no a sleep! How horrible!
345+
// Actually, this is a good thing! If we reach this point because the httpserver
346+
// provider upgraded really quickly, that means we still have to wait 5 seconds
347+
// for the provider health check to trigger linkdef creation. So, after everything
348+
// gets created, give the linkdef scaler time to react to the provider health check.
349+
tokio::time::sleep(Duration::from_secs(5)).await;
337350
let links = client_info
338351
.ctl_client("default")
339352
.query_links()

tests/e2e_multitenant.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![cfg(feature = "_e2e_tests")]
2-
use std::path::PathBuf;
2+
use std::{path::PathBuf, time::Duration};
33

44
use futures::StreamExt;
55
use wadm::server::{DeployResult, PutResult, StatusType};
@@ -158,6 +158,13 @@ async fn test_basic_separation(client_info: &ClientInfo) -> anyhow::Result<()> {
158158
"wasmcloud.azurecr.io/httpserver:0.17.0",
159159
ExpectedCount::Exactly(1),
160160
)?;
161+
162+
// Oh no a sleep! How horrible!
163+
// Actually, this is a good thing! If we reach this point because the httpserver
164+
// provider upgraded really quickly, that means we still have to wait 5 seconds
165+
// for the provider health check to trigger linkdef creation. So, after everything
166+
// gets created, give the linkdef scaler time to react to the provider health check.
167+
tokio::time::sleep(Duration::from_secs(5)).await;
161168
let links = client_info
162169
.ctl_client(LATTICE_EAST)
163170
.query_links()

tests/e2e_upgrades.rs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,14 @@ async fn test_upgrade(client_info: &ClientInfo) {
132132
"wasmcloud.azurecr.io/kvredis:0.22.0",
133133
ExpectedCount::Exactly(1),
134134
)?;
135+
136+
// Oh no a sleep! How horrible!
137+
// Actually, this is a good thing! If we reach this point because the httpserver
138+
// provider upgraded really quickly, that means we still have to wait 5 seconds
139+
// for the provider health check to trigger linkdef creation. So, after everything
140+
// gets created, give the linkdef scaler time to react to the provider health check.
141+
tokio::time::sleep(Duration::from_secs(5)).await;
142+
135143
let links = client_info
136144
.ctl_client("default")
137145
.query_links()
@@ -207,6 +215,7 @@ async fn test_upgrade(client_info: &ClientInfo) {
207215

208216
assert_status(None, None, || async {
209217
let inventory = client_info.get_all_inventory("default").await?;
218+
println!("Inventory: {:?}", inventory);
210219

211220
check_actors(
212221
&inventory,
@@ -242,12 +251,19 @@ async fn test_upgrade(client_info: &ClientInfo) {
242251
"wasmcloud.azurecr.io/kvredis:0.22.0",
243252
ExpectedCount::Exactly(0),
244253
)?;
254+
255+
// Oh no a sleep! How horrible!
256+
// Actually, this is a good thing! If we reach this point because the httpserver
257+
// provider upgraded really quickly, that means we still have to wait 5 seconds
258+
// for the provider health check to trigger linkdef creation. So, after everything
259+
// gets created, give the linkdef scaler time to react to the provider health check.
260+
tokio::time::sleep(Duration::from_secs(5)).await;
261+
245262
let links = client_info
246263
.ctl_client("default")
247264
.query_links()
248265
.await
249266
.map_err(|e| anyhow::anyhow!("{e:?}"))?;
250-
251267
if !links.links.iter().any(|ld| {
252268
ld.actor_id == ECHO_ACTOR_ID
253269
&& ld.provider_id == HTTP_SERVER_PROVIDER_ID

tests/helpers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ async fn start_wash_instance(cfg: &TestWashConfig) -> Result<CleanupGuard> {
9898
"--host-seed",
9999
&seed,
100100
"--wasmcloud-version",
101-
"v0.78.0-rc9",
101+
"v0.78.0-rc10",
102102
]);
103103
if cfg.nats_connect_only {
104104
args.push("--nats-connect-only");

0 commit comments

Comments
 (0)