Merge branch 'cxymds/fix-1358-opaque-transition-metadata' into cxymds/fix-1358-fleet-version-gate

2026-07-30 10:08:58 +00:00 · 2026-07-28 19:40:09 +08:00
parent bf985f58bc c22d9d316b
commit eff1d0c219
1 changed files with 11 additions and 1 deletions
@@ -9778,7 +9778,17 @@ mod tests {
            Ok(_) => panic!("unknown remote version state must not persist a delete journal"),
            Err(err) => err,
        };
-        assert!(matches!(legacy_err, StorageError::FileNotFound));
+        assert!(
+            matches!(
+                &legacy_err,
+                StorageError::FileNotFound
+                    | StorageError::ObjectNotFound(_, _)
+                    | StorageError::FileVersionNotFound
+                    | StorageError::VersionNotFound(_, _, _)
+                    | StorageError::VolumeNotFound
+            ),
+            "unknown remote version state must leave no journal, got {legacy_err:?}"
+        );
    }

    async fn put_real_cold_fill_object(store: &Arc<ECStore>, bucket: &str, object: &str, body: &[u8]) -> ObjectInfo {