Skip to content

Commit 0c62b5b

Browse files
changes from review
1 parent b2697df commit 0c62b5b

2 files changed

Lines changed: 17 additions & 10 deletions

File tree

sdks/rust/tests/test-client/src/test_handlers.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ pub async fn dispatch(test: &str, db_name: &str) {
8888
// "resubscribe" => exec_resubscribe(),
8989
//
9090
"reauth" => exec_reauth(db_name).await,
91-
"reauth-part-1" => exec_reauth_part_1(db_name).await,
92-
"reauth-part-2" => exec_reauth_part_2(db_name).await,
9391

9492
"should-fail" => exec_should_fail(db_name).await,
9593

sdks/rust/tests/test-counter/src/lib.rs

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,36 @@ static SERVER_URL: OnceLock<String> = OnceLock::new();
1212

1313
pub fn set_server_url(url: String) {
1414
if SERVER_URL.set(url).is_err() {
15-
panic!("{TEST_SERVER_URL_ENV_VAR} was set more than once");
15+
panic!("SDK test server URL was initialized more than once");
1616
}
1717
}
1818

1919
pub fn server_url() -> &'static str {
20-
SERVER_URL.get_or_init(server_url_from_env).as_str()
21-
}
22-
23-
fn server_url_from_env() -> String {
2420
#[cfg(not(target_arch = "wasm32"))]
2521
{
26-
std::env::var(TEST_SERVER_URL_ENV_VAR)
27-
.unwrap_or_else(|_| panic!("{TEST_SERVER_URL_ENV_VAR} must be set by the SDK test harness"))
22+
SERVER_URL.get_or_init(read_server_url_from_env).as_str()
2823
}
2924

3025
#[cfg(target_arch = "wasm32")]
3126
{
32-
panic!("{TEST_SERVER_URL_ENV_VAR} must be passed to the wasm SDK test harness")
27+
SERVER_URL
28+
.get()
29+
.unwrap_or_else(|| {
30+
panic!(
31+
"server URL was not initialized; \
32+
the wasm SDK test harness must read {TEST_SERVER_URL_ENV_VAR} and pass it to run()"
33+
)
34+
})
35+
.as_str()
3336
}
3437
}
3538

39+
#[cfg(not(target_arch = "wasm32"))]
40+
fn read_server_url_from_env() -> String {
41+
std::env::var(TEST_SERVER_URL_ENV_VAR)
42+
.unwrap_or_else(|_| panic!("{TEST_SERVER_URL_ENV_VAR} must be set by the SDK test harness"))
43+
}
44+
3645
#[derive(Default)]
3746
struct TestCounterInner {
3847
/// Maps test names to their outcomes

0 commit comments

Comments
 (0)