huskies: merge 961
This commit is contained in:
@@ -703,7 +703,7 @@ async fn server_side_merge_happy_path_advances_to_done() {
|
||||
if report.success {
|
||||
// story_archived may or may not be true depending on gate env,
|
||||
// but merge_failure must NOT be in the content store.
|
||||
let content = crate::db::read_content("757a_happy");
|
||||
let content = crate::db::read_content(crate::db::ContentKey::Story("757a_happy"));
|
||||
if let Some(c) = content {
|
||||
assert!(
|
||||
!c.contains("merge_failure"),
|
||||
@@ -713,7 +713,7 @@ async fn server_side_merge_happy_path_advances_to_done() {
|
||||
} else {
|
||||
// Gate failure (no script/test) is acceptable in test env —
|
||||
// but merge_failure should be written.
|
||||
let content = crate::db::read_content("757a_happy");
|
||||
let content = crate::db::read_content(crate::db::ContentKey::Story("757a_happy"));
|
||||
if let Some(c) = content {
|
||||
// merge_failure should be written for gate failures
|
||||
assert!(
|
||||
|
||||
Reference in New Issue
Block a user