Tests passing again

holochain-open-dev · Apr 29, 2024 · f12b9ac · f12b9ac
1 parent 0ef5ce9
commit f12b9ac
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 40 deletions.
diff --git a/crates/coordinator/tests/create_and_get.rs b/crates/coordinator/tests/create_and_get.rs
@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 
 use hc_zome_profiles_integrity::*;
 use hdk::prelude::*;
-use holochain::test_utils::consistency_10s;
 use holochain::{conductor::config::ConductorConfig, sweettest::*};
 
 #[tokio::test(flavor = "multi_thread")]
@@ -41,7 +40,7 @@ async fn create_and_get() {
         .call(&alice_zome, "create_profile", profile)
         .await;
 
-    consistency_10s([&alice, &bobbo]).await;
+    await_consistency(30, [&alice, &bobbo]).await.unwrap();
 
     let record_2: Option<Record> = conductors[0]
         .call(&alice_zome, "get_agent_profile", alice_pub_key)
@@ -65,7 +64,7 @@ async fn create_and_get() {
         .call(&alice_zome, "update_profile", profile.clone())
         .await;
 
-    consistency_10s([&alice, &bobbo]).await;
+    await_consistency(30, [&alice, &bobbo]).await.unwrap();
 
     // ---> get it over the DHT though get_agent_profile()
     let alices_profile: Option<Record> = conductors[1]
@@ -111,7 +110,7 @@ async fn create_and_get() {
         )
         .await;
 
-    let all_agents: Vec<AgentPubKey> = conductors[1]
+    let all_agents: Vec<Link> = conductors[1]
         .call(&bob_zome, "get_agents_with_profile", ())
         .await;
 

diff --git a/crates/coordinator/tests/search.rs b/crates/coordinator/tests/search.rs
@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 
 use hc_zome_profiles_integrity::*;
 use holochain::prelude::{AgentPubKey, Record};
-use holochain::test_utils::consistency_10s;
 use holochain::{conductor::config::ConductorConfig, sweettest::*};
 
 #[tokio::test(flavor = "multi_thread")]
@@ -42,7 +41,7 @@ async fn create_and_get() {
         )
         .await;
 
-    consistency_10s([&alice, &bobbo]).await;
+    await_consistency(30, [&alice, &bobbo]).await.unwrap();
 
     let agents_searched: Vec<AgentPubKey> = conductors[1]
         .call(&bob_zome, "search_agents", String::from("ali"))

diff --git a/flake.lock b/flake.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "start": "AGENTS=2 npm run network",
     "network": "hc s clean && npm run build:happ && BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run local-services\" \"npm run launch\" \"holochain-playground\"",
-    "test": "npm run build:happ && nix flake check && npm test -w tests",
+    "test": "npm run build:happ && nix flake check -L && npm test -w tests",
     "launch": "echo pass | RUST_LOG=warn hc launch --piped -n $AGENTS workdir/profiles-test.happ --ui-port $UI_PORT network --bootstrap http://127.0.0.1:$BOOTSTRAP_PORT webrtc ws://127.0.0.1:$SIGNAL_PORT",
     "local-services": "hc run-local-services --bootstrap-port $BOOTSTRAP_PORT --signal-port $SIGNAL_PORT",
     "build:happ": "npm run build:zome && hc app pack workdir --recursive",

diff --git a/tests/package.json b/tests/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@msgpack/msgpack": "^2.8.0",
     "@holochain/client": "^0.17.0-dev.12",
-    "@holochain/tryorama": "^0.16.0-dev.5",
+    "@holochain/tryorama": "^0.16.0-dev.6",
     "@holochain-open-dev/signals": "^0.300.0-dev.5",
     "@holochain-open-dev/utils": "^0.300.0-dev.2",
     "typescript": "^4.9.4",

diff --git a/tests/src/profile.test.ts b/tests/src/profile.test.ts
@@ -32,7 +32,7 @@ test("create Profile", async () => {
     assert.equal(agentsWithProfile.length, 1);
 
     const profileStatus = alice.store.myProfile$.get();
-    assert.equal(profileStatus.status, "complete");
+    assert.equal(profileStatus.status, "completed");
     assert.ok((profileStatus as any).value);
   });
 });