Merge pull request #217 from theseus-rs/prevent-bundled-network-access

fix: always use the build version of postgresql when the bundled feature is enabled to avoid network access

Author: brianheineman

examples/archive_async/src/main.rs

@@ -25,7 +25,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_archive_async_main() -> Result<()> {
         main()
     }
 }

examples/archive_sync/src/main.rs

@@ -25,7 +25,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_archive_sync_main() -> Result<()> {
         main()
     }
 }

examples/diesel_embedded/src/main.rs

@@ -72,7 +72,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_diesel_embedded_main() -> Result<()> {
         main()
     }
 }

examples/download_progress_bar/src/main.rs

@@ -43,7 +43,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_download_progress_bar_main() -> Result<()> {
         main()
     }
 }

examples/embedded_async/src/main.rs

@@ -27,7 +27,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_embedded_async_main() -> Result<()> {
         main()
     }
 }

examples/embedded_sync/src/main.rs

@@ -23,7 +23,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_embedded_sync_main() -> Result<()> {
         main()
     }
 }

examples/portal_corp_extension/src/main.rs

@@ -18,13 +18,22 @@ async fn main() -> Result<()> {
     tracing_subscriber::fmt().compact().init();
 
     info!("Installing PostgreSQL");
+    let postgresql_version = VersionReq::parse("=16.4.0")?;
     let settings = Settings {
-        version: VersionReq::parse("=16.4.0")?,
+        version: postgresql_version.clone(),
         ..Default::default()
     };
     let mut postgresql = PostgreSQL::new(settings);
     postgresql.setup().await?;
 
+    let settings = postgresql.settings();
+    // Skip the test if the PostgreSQL version does not match; when testing with the 'bundled'
+    // feature, the version may vary and the test will fail.
+    if settings.version != postgresql_version {
+        eprintln!("Postgresql version does not match");
+        return Ok(());
+    }
+
     info!("Installing the vector extension from PortalCorp");
     postgresql_extensions::install(
         postgresql.settings(),
@@ -120,10 +129,12 @@ async fn execute_query(pool: &PgPool, query: &str) -> Result<()> {
 
 #[cfg(test)]
 mod test {
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     use super::*;
 
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_portal_corp_extension_main() -> Result<()> {
         main()
     }
 }

examples/postgres_embedded/src/main.rs

@@ -93,7 +93,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_postgres_embedded_main() -> Result<()> {
         main()
     }
 }

examples/sqlx_embedded/src/main.rs

@@ -92,7 +92,7 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_sqlx_embedded_main() -> Result<()> {
         main()
     }
 }

examples/tensor_chord_extension/src/main.rs

@@ -147,13 +147,14 @@ async fn execute_query(pool: &PgPool, query: &str) -> Result<()> {
     Ok(())
 }
 
-#[cfg(target_os = "linux")]
 #[cfg(test)]
 mod test {
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     use super::*;
 
+    #[cfg(not(all(target_os = "linux", target_arch = "x86_64")))]
     #[test]
-    fn test_main() -> Result<()> {
+    fn test_tensor_chord_extension_main() -> Result<()> {
         main()
     }
 }