From c4e1680c5af8e992fcc2b67943b03dbbdbbe691b Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Tue, 18 Mar 2025 11:53:16 +0100
Subject: [PATCH] cleanup

---
 test/pg_regress.sh                                 |  9 ++++-----
 test/runner.sh                                     | 14 --------------
 .../expected/cagg_refresh_policy_incremental.out   |  7 -------
 tsl/test/sql/cagg_refresh_policy_incremental.sql   |  3 ---
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/test/pg_regress.sh b/test/pg_regress.sh
index ba7b6618c..932b522e7 100755
--- a/test/pg_regress.sh
+++ b/test/pg_regress.sh
@@ -211,15 +211,14 @@ mkdir -p ${EXE_DIR}/sql/dump
 
 export PG_REGRESS_DIFF_OPTS
 
+# If so configured, we run the tests with faketime utility to change the current
+# time. This helps catch the mistakes with using the current time in test
+# references. We can't do this for isolation tests because this breaks the
+# waiting mechanism in isolation tester.
 if [[ "${PG_REGRESS_USE_FAKETIME}" == "1" ]]
 then
     PG_REGRESS_FAKETIME="${FAKETIME}"
 fi
 
-echo --------------------------------
-echo FAKETIME IS ${FAKETIME}, PG_REGRESS_FAKETIME IS ${PG_REGRESS_FAKETIME}
-echo ********************************
-pstree -sla $$
-
 PG_REGRESS_OPTS="${PG_REGRESS_OPTS}  --schedule=${SCHEDULE}"
 ${PG_REGRESS_FAKETIME} ${PG_REGRESS} "$@" ${PG_REGRESS_OPTS}
diff --git a/test/runner.sh b/test/runner.sh
index 1173a090e..82c852b6e 100755
--- a/test/runner.sh
+++ b/test/runner.sh
@@ -115,20 +115,6 @@ ${PSQL} "$@" -U $TEST_ROLE_SUPERUSER -d ${TEST_DBNAME} \
     -f ${TEST_SUPPORT_FILE_INIT} >/dev/null 2>&1
 export TEST_DBNAME
 
-# FIXME
-## We run the regression test with changed time using the faketime utility, to
-## catch the erroneous use of now(). This breaks waiting in the isolation test
-## runner, so we only do it for the pg_regress.
-#PG_REGRESS_FAKETIME="${FAKETIME:-}"
-#export PG_REGRESS_FAKETIME
-
-#echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-#echo FAKETIME IS ${FAKETIME}, PG_REGRESS_FAKETIME IS ${PG_REGRESS_FAKETIME}
-#echo "]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
-#pstree -sla $$
-
-#exit -1
-
 # we strip out any output between <exclude_from_test></exclude_from_test>
 # and the part about memory usage in EXPLAIN ANALYZE output of Sort nodes
 # also ignore the Postgres rehashing catalog debug messages from 'src/backend/utils/cache/catcache.c'
diff --git a/tsl/test/expected/cagg_refresh_policy_incremental.out b/tsl/test/expected/cagg_refresh_policy_incremental.out
index 1a439ca3f..b39c603b0 100644
--- a/tsl/test/expected/cagg_refresh_policy_incremental.out
+++ b/tsl/test/expected/cagg_refresh_policy_incremental.out
@@ -601,10 +601,3 @@ FROM
 REASSIGN OWNED BY test_cagg_refresh_policy_user TO :ROLE_CLUSTER_SUPERUSER;
 REVOKE ALL ON SCHEMA public FROM test_cagg_refresh_policy_user;
 DROP ROLE test_cagg_refresh_policy_user;
--- FIXME
-select time_bucket('1 month', now());
-         time_bucket          
-------------------------------
- Fri Feb 28 16:00:00 2025 PST
-(1 row)
-
diff --git a/tsl/test/sql/cagg_refresh_policy_incremental.sql b/tsl/test/sql/cagg_refresh_policy_incremental.sql
index 982db7cc9..11aa646c8 100644
--- a/tsl/test/sql/cagg_refresh_policy_incremental.sql
+++ b/tsl/test/sql/cagg_refresh_policy_incremental.sql
@@ -339,6 +339,3 @@ FROM
 REASSIGN OWNED BY test_cagg_refresh_policy_user TO :ROLE_CLUSTER_SUPERUSER;
 REVOKE ALL ON SCHEMA public FROM test_cagg_refresh_policy_user;
 DROP ROLE test_cagg_refresh_policy_user;
-
--- FIXME
-select time_bucket('1 month', now());