From 9474cd42a026fd70175c1d9744166545a0de120e Mon Sep 17 00:00:00 2001
From: Andrew Lamb <andrew@nerdnetworks.org>
Date: Wed, 31 May 2023 13:51:56 -0400
Subject: [PATCH] Standardize RUST_LOG configuration test setup

---
 datafusion/core/tests/memory_limit.rs            | 1 +
 datafusion/core/tests/parquet/filter_pushdown.rs | 7 -------
 datafusion/core/tests/parquet/mod.rs             | 7 +++++++
 datafusion/core/tests/sql/subqueries.rs          | 6 ------
 datafusion/core/tests/sql_integration.rs         | 7 +++++++
 datafusion/expr/src/expr_rewriter/mod.rs         | 5 -----
 datafusion/expr/src/lib.rs                       | 7 +++++++
 datafusion/optimizer/src/lib.rs                  | 2 +-
 datafusion/optimizer/tests/integration-test.rs   | 1 +
 datafusion/sql/tests/integration_test.rs         | 1 +
 10 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/datafusion/core/tests/memory_limit.rs b/datafusion/core/tests/memory_limit.rs
index a37b6306ecf0c..f2e1223dc6ec8 100644
--- a/datafusion/core/tests/memory_limit.rs
+++ b/datafusion/core/tests/memory_limit.rs
@@ -39,6 +39,7 @@ use test_utils::AccessLogGenerator;
 #[cfg(test)]
 #[ctor::ctor]
 fn init() {
+    // Enable RUST_LOG logging configuration for test
     let _ = env_logger::try_init();
 }
 
diff --git a/datafusion/core/tests/parquet/filter_pushdown.rs b/datafusion/core/tests/parquet/filter_pushdown.rs
index 0ace8bea31625..885834f939791 100644
--- a/datafusion/core/tests/parquet/filter_pushdown.rs
+++ b/datafusion/core/tests/parquet/filter_pushdown.rs
@@ -63,13 +63,6 @@ fn generate_file(tempdir: &TempDir, props: WriterProperties) -> TestParquetFile
     test_parquet_file
 }
 
-#[cfg(test)]
-#[ctor::ctor]
-fn init() {
-    // enable logging so RUST_LOG works
-    let _ = env_logger::try_init();
-}
-
 #[cfg(not(target_family = "windows"))]
 #[tokio::test]
 async fn single_file() {
diff --git a/datafusion/core/tests/parquet/mod.rs b/datafusion/core/tests/parquet/mod.rs
index 86ab41e1f1fc5..f4da1efb80ed1 100644
--- a/datafusion/core/tests/parquet/mod.rs
+++ b/datafusion/core/tests/parquet/mod.rs
@@ -47,6 +47,13 @@ mod filter_pushdown;
 mod page_pruning;
 mod row_group_pruning;
 
+#[cfg(test)]
+#[ctor::ctor]
+fn init() {
+    // Enable RUST_LOG logging configuration for test
+    let _ = env_logger::try_init();
+}
+
 // ----------------------
 // Begin test fixture
 // ----------------------
diff --git a/datafusion/core/tests/sql/subqueries.rs b/datafusion/core/tests/sql/subqueries.rs
index 640628e0b5006..574553a938da5 100644
--- a/datafusion/core/tests/sql/subqueries.rs
+++ b/datafusion/core/tests/sql/subqueries.rs
@@ -21,12 +21,6 @@ use datafusion::assert_batches_eq;
 use datafusion::prelude::SessionContext;
 use log::debug;
 
-#[cfg(test)]
-#[ctor::ctor]
-fn init() {
-    let _ = env_logger::try_init();
-}
-
 #[tokio::test]
 async fn correlated_recursive_scalar_subquery() -> Result<()> {
     let ctx = SessionContext::new();
diff --git a/datafusion/core/tests/sql_integration.rs b/datafusion/core/tests/sql_integration.rs
index b5fcd81d0307c..f01298ac6d7f2 100644
--- a/datafusion/core/tests/sql_integration.rs
+++ b/datafusion/core/tests/sql_integration.rs
@@ -17,3 +17,10 @@
 
 /// Run all tests that are found in the `sql` directory
 mod sql;
+
+#[cfg(test)]
+#[ctor::ctor]
+fn init() {
+    // Enable RUST_LOG logging configuration for test
+    let _ = env_logger::try_init();
+}
diff --git a/datafusion/expr/src/expr_rewriter/mod.rs b/datafusion/expr/src/expr_rewriter/mod.rs
index 63b5d3ed67308..ca9383709f5eb 100644
--- a/datafusion/expr/src/expr_rewriter/mod.rs
+++ b/datafusion/expr/src/expr_rewriter/mod.rs
@@ -224,11 +224,6 @@ mod test {
     use datafusion_common::tree_node::{RewriteRecursion, TreeNode, TreeNodeRewriter};
     use datafusion_common::{DFField, DFSchema, ScalarValue};
 
-    #[ctor::ctor]
-    fn init() {
-        let _ = env_logger::try_init();
-    }
-
     #[derive(Default)]
     struct RecordingRewriter {
         v: Vec<String>,
diff --git a/datafusion/expr/src/lib.rs b/datafusion/expr/src/lib.rs
index 45777e09d4bb9..9f3841841b4c8 100644
--- a/datafusion/expr/src/lib.rs
+++ b/datafusion/expr/src/lib.rs
@@ -76,3 +76,10 @@ pub use udaf::AggregateUDF;
 pub use udf::ScalarUDF;
 pub use window_frame::{WindowFrame, WindowFrameBound, WindowFrameUnits};
 pub use window_function::{BuiltInWindowFunction, WindowFunction};
+
+#[cfg(test)]
+#[ctor::ctor]
+fn init() {
+    // Enable RUST_LOG logging configuration for test
+    let _ = env_logger::try_init();
+}
diff --git a/datafusion/optimizer/src/lib.rs b/datafusion/optimizer/src/lib.rs
index 7930c059ea47f..d500debf59d4c 100644
--- a/datafusion/optimizer/src/lib.rs
+++ b/datafusion/optimizer/src/lib.rs
@@ -53,6 +53,6 @@ mod plan_signature;
 #[cfg(test)]
 #[ctor::ctor]
 fn init() {
-    // Enable logging for tests
+    // Enable RUST_LOG logging configuration for test
     let _ = env_logger::try_init();
 }
diff --git a/datafusion/optimizer/tests/integration-test.rs b/datafusion/optimizer/tests/integration-test.rs
index a4220797453ed..dfd1955177c9a 100644
--- a/datafusion/optimizer/tests/integration-test.rs
+++ b/datafusion/optimizer/tests/integration-test.rs
@@ -35,6 +35,7 @@ use std::sync::Arc;
 #[cfg(test)]
 #[ctor::ctor]
 fn init() {
+    // enable logging so RUST_LOG works
     let _ = env_logger::try_init();
 }
 
diff --git a/datafusion/sql/tests/integration_test.rs b/datafusion/sql/tests/integration_test.rs
index c8aaf060b85d7..892cf48d56b54 100644
--- a/datafusion/sql/tests/integration_test.rs
+++ b/datafusion/sql/tests/integration_test.rs
@@ -40,6 +40,7 @@ use rstest::rstest;
 #[cfg(test)]
 #[ctor::ctor]
 fn init() {
+    // Enable RUST_LOG logging configuration for tests
     let _ = env_logger::try_init();
 }