From 9653a0065e30edcf415032e17e46b1d33771c6f5 Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Wed, 24 Aug 2022 17:54:33 +0200 Subject: [PATCH] Use C.UTF-8 locale in tests I upgraded my OS to Ubuntu 22.04 a while back and since then some tests order output slightly differently. I think it might be because of the glibc upgrade that changed ordering for things like underscores and spaces. Changing the locale to C.UTF-8 solves this issue. --- src/test/regress/citus_tests/common.py | 4 +++- src/test/regress/pg_regress_multi.pl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/regress/citus_tests/common.py b/src/test/regress/citus_tests/common.py index dcde8a5af..5f98d723b 100644 --- a/src/test/regress/citus_tests/common.py +++ b/src/test/regress/citus_tests/common.py @@ -50,7 +50,9 @@ def initialize_db_for_cluster(pg_path, rel_data_path, settings, node_names): # private keys correctly "--allow-group-access", "--encoding", - "UTF8" + "UTF8", + "--locale", + "C.UTF-8", ] subprocess.run(command, check=True) add_settings(abs_data_path, settings) diff --git a/src/test/regress/pg_regress_multi.pl b/src/test/regress/pg_regress_multi.pl index 01e36a6d2..304141fc5 100755 --- a/src/test/regress/pg_regress_multi.pl +++ b/src/test/regress/pg_regress_multi.pl @@ -704,7 +704,7 @@ if (!$conninfo) # Create new data directories, copy workers for speed # --allow-group-access is used to ensure we set permissions on private keys # correctly - system(catfile("$bindir", "initdb"), ("--no-sync", "--allow-group-access", "-U", $user, "--encoding", "UTF8", catfile($TMP_CHECKDIR, $MASTERDIR, "data"))) == 0 + system(catfile("$bindir", "initdb"), ("--no-sync", "--allow-group-access", "-U", $user, "--encoding", "UTF8", "--locale", "C.UTF-8", catfile($TMP_CHECKDIR, $MASTERDIR, "data"))) == 0 or die "Could not create $MASTERDIR data directory"; generate_hba("master");