Merge pull request #1514 from andyleiserson/fix-test

Fix input_from_url test
private-attribution · Dec 20, 2024 · 291efab · 291efab
2 parents c49d3f9 + 4d41274
commit 291efab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/ipa-core/src/net/error.rs b/ipa-core/src/net/error.rs
@@ -54,7 +54,7 @@ pub enum Error {
         status: hyper::StatusCode,
         reason: String,
     },
-    #[error("Failed to connect to {dest}: {inner}")]
+    #[error("Failed to connect to {dest}: {inner:?}")]
     ConnectError {
         dest: String,
         #[source]

diff --git a/ipa-core/src/net/query_input.rs b/ipa-core/src/net/query_input.rs
@@ -26,7 +26,7 @@ pub async fn stream_query_input_from_url(uri: &Uri) -> Result<BodyStream, Error>
         HttpsConnectorBuilder::default()
             .with_native_roots()
             .expect("System truststore is required")
-            .https_only()
+            .https_or_http()
             .enable_all_versions()
             .build(),
     );

diff --git a/ipa-core/src/net/server/handlers/query/input.rs b/ipa-core/src/net/server/handlers/query/input.rs
@@ -98,7 +98,7 @@ mod tests {
     #[tokio::test(flavor = "multi_thread")]
     async fn input_from_url() {
         const QUERY_ID: QueryId = QueryId;
-        const DATA: &str = "input records";
+        const DATA: &str = "<input records>";
 
         let server = tiny_http::Server::http("localhost:0").unwrap();
         let addr = server.server_addr();
@@ -124,9 +124,8 @@ mod tests {
             .await;
 
         let url = format!(
-            "http://localhost:{}{}/{QUERY_ID}/input",
+            "http://localhost:{}/input-data",
             addr.to_ip().unwrap().port(),
-            http_serde::query::BASE_AXUM_PATH,
         );
         let req = http_serde::query::input::Request::new(QueryInput::FromUrl {
             query_id: QUERY_ID,