use expectorate

oxidecomputer · Aug 28, 2024 · 16b2457 · 16b2457
1 parent e8bb7fe
commit 16b2457
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clickhouse-admin/types/Cargo.toml b/clickhouse-admin/types/Cargo.toml
@@ -17,3 +17,4 @@ omicron-workspace-hack.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+expectorate.workspace = true
diff --git a/clickhouse-admin/types/src/config.rs b/clickhouse-admin/types/src/config.rs
@@ -255,6 +255,7 @@ impl KeeperConfigsForReplica {
             // they must be wrapped in square brackets.
             // Otherwise, when running any query, a "Service not found" error
             // appears.
+            // https://github.com/ClickHouse/ClickHouse/blob/a011990fd75628c63c7995c4f15475f1d4125d10/src/Coordination/KeeperStateManager.cpp#L149
             let parsed_host = match host.parse::<Ipv6Addr>() {
                 Ok(_) => format!("[{host}]"),
                 Err(_) => host.to_string(),

diff --git a/clickhouse-admin/types/src/lib.rs b/clickhouse-admin/types/src/lib.rs
@@ -190,14 +190,12 @@ mod tests {
         let expected_file = Utf8PathBuf::from_str("./testutils")
             .unwrap()
             .join("keeper-config.xml");
-        let expected_content = std::fs::read_to_string(expected_file)
-            .expect("Failed to read from expected ClickHouse keeper file");
         let generated_file =
             Utf8PathBuf::from(config_dir.path()).join("keeper-config.xml");
         let generated_content = std::fs::read_to_string(generated_file)
             .expect("Failed to read from generated ClickHouse keeper file");
 
-        assert_eq!(expected_content, generated_content);
+        expectorate::assert_contents(expected_file, &generated_content);
     }
 
     #[test]
@@ -233,15 +231,12 @@ mod tests {
         let expected_file = Utf8PathBuf::from_str("./testutils")
             .unwrap()
             .join("replica-server-config.xml");
-        let expected_content = std::fs::read_to_string(expected_file).expect(
-            "Failed to read from expected ClickHouse replica server file",
-        );
         let generated_file = Utf8PathBuf::from(config_dir.path())
             .join("replica-server-config.xml");
         let generated_content = std::fs::read_to_string(generated_file).expect(
             "Failed to read from generated ClickHouse replica server file",
         );
 
-        assert_eq!(expected_content, generated_content);
+        expectorate::assert_contents(expected_file, &generated_content);
     }
 }