From f6f8f96289b42dffdd7ede1f28ce41935188768d Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Wed, 21 Dec 2022 16:56:03 +0100 Subject: [PATCH] Fix tests due to postgres error msg filtered in wrong language Eg by calling `make test TESTS=t/api/04-jobs.t` --- Makefile | 1 + t/ui/21-admin-needles.t | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 97e1e25333de..7ed12b8e67cf 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ CRE ?= podman # avoid localized error messages (that are matched against in certain cases) LC_ALL = C.utf8 LANGUAGE = +LANG = C.utf8 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) current_dir := $(patsubst %/,%,$(dir $(mkfile_path))) container_env_file := "$(current_dir)/container.env" diff --git a/t/ui/21-admin-needles.t b/t/ui/21-admin-needles.t index 0690e096e609..eea85bb96c07 100644 --- a/t/ui/21-admin-needles.t +++ b/t/ui/21-admin-needles.t @@ -317,9 +317,9 @@ subtest 'custom needles search' => sub { @needle_trs = $driver->find_elements('#needles tbody tr'); is(scalar(@needle_trs), 2, 'only show five_month and five_month-undef needles'); - my @needle_tds = $driver->find_child_elements($needle_trs[0], 'td', 'css'); + my @needle_tds = $driver->find_child_elements($needle_trs[1], 'td', 'css'); is($needle_tds[1]->get_text(), 'five_month.json', 'search five_month needle correctly'); - @needle_tds = $driver->find_child_elements($needle_trs[1], 'td', 'css'); + @needle_tds = $driver->find_child_elements($needle_trs[0], 'td', 'css'); is($needle_tds[1]->get_text(), 'five_month-undef.json', 'search five_month-undef needle correctly'); $last_match_options[7]->click(); @@ -348,9 +348,9 @@ subtest 'custom needles search' => sub { wait_for_ajax(msg => 'custom needle seen "not last" and match "not last" range', with_minion => $minion); @needle_trs = $driver->find_elements('#needles tbody tr'); is(scalar(@needle_trs), 2, 'show seven_month and seven_month-undef'); - @needle_tds = $driver->find_child_elements($needle_trs[0], 'td', 'css'); - is($needle_tds[1]->get_text(), 'seven_month.json', 'search seven_month needle correctly'); @needle_tds = $driver->find_child_elements($needle_trs[1], 'td', 'css'); + is($needle_tds[1]->get_text(), 'seven_month.json', 'search seven_month needle correctly'); + @needle_tds = $driver->find_child_elements($needle_trs[0], 'td', 'css'); is($needle_tds[1]->get_text(), 'seven_month-undef.json', 'search seven_month-undef needle correctly'); $last_seen_options[0]->click(); @@ -358,13 +358,13 @@ subtest 'custom needles search' => sub { wait_for_ajax(msg => '"all time" seen and "not last two months" match', with_minion => $minion); @needle_trs = $driver->find_elements('#needles tbody tr'); is(scalar(@needle_trs), 4, 'show all needles'); - @needle_tds = $driver->find_child_elements($needle_trs[0], 'td', 'css'); + @needle_tds = $driver->find_child_elements($needle_trs[3], 'td', 'css'); is($needle_tds[1]->get_text(), 'five_month.json', 'search five_month needle correctly'); - @needle_tds = $driver->find_child_elements($needle_trs[1], 'td', 'css'); - is($needle_tds[1]->get_text(), 'five_month-undef.json', 'search five_month-undef needle correctly'); @needle_tds = $driver->find_child_elements($needle_trs[2], 'td', 'css'); + is($needle_tds[1]->get_text(), 'five_month-undef.json', 'search five_month-undef needle correctly'); + @needle_tds = $driver->find_child_elements($needle_trs[1], 'td', 'css'); is($needle_tds[1]->get_text(), 'seven_month.json', 'search seven_month needle correctly'); - @needle_tds = $driver->find_child_elements($needle_trs[3], 'td', 'css'); + @needle_tds = $driver->find_child_elements($needle_trs[0], 'td', 'css'); is($needle_tds[1]->get_text(), 'seven_month-undef.json', 'search seven_month-undef needle correctly'); };