Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test by make sorting independent of locale and case #9640

Merged
merged 3 commits into from
Sep 19, 2024
Merged

Fix test by make sorting independent of locale and case #9640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a86a6fd
Install requited locale in container image
pabzm Sep 18, 2024
822e436
Explicitly require mandatory locale for test
pabzm Sep 18, 2024
5a668ee
Schedule to rebuild testrunner image each week
pabzm Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .ci/docker-images/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ RUN apt-get update \
aspell-de \
hunspell-en-us \
git \
locales \
&& apt-get clean

# Some tests require en_US.UTF-8 as locale.
RUN sed -i 's/^# en_US.UTF-8 /en_US.UTF-8 /' /etc/locale.gen && locale-gen

# TODO: Do we need the multiarch-args? What for?
#RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
RUN docker-php-ext-configure gd --with-jpeg --with-freetype \
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/docker_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
paths:
- '.ci/docker-images/*'
- '.github/workflows/docker_image.yml'
schedule:
# Rebuild automatically each monday early morning.
- cron: "42 5 * * 1"

jobs:
build_and_push:
Expand Down
5 changes: 5 additions & 0 deletions tests/Framework/ImapTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ public function test_convert_criteria()
*/
public function test_sort_folder_list()
{
// The sorting requires this locale.
if (setlocale(\LC_ALL, 'en_US.UTF-8', 'en_US.utf8', 'en_US', 'en-US') === false) {
throw new \Error('This test requires `en_US` to be settable as locale, but those appear to not be present in your environment!');
}

$_SESSION['imap_delimiter'] = '.';
$_SESSION['imap_namespace'] = [
'personal' => null,
Expand Down