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

Test using 22.04 again #16650

Merged
merged 3 commits into from Aug 5, 2022
Merged

Test using 22.04 again #16650

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
9201e12
Test using 22.04 again
markstory Jul 25, 2022
5731856
Add another intl variant.
markstory Jul 25, 2022
b98a0dc
Conditionally skip test that fails because of openssl
markstory Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
testsuite:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down
15 changes: 11 additions & 4 deletions tests/TestCase/Http/Client/Auth/OauthTest.php
View file
Open in desktop
Expand Up @@ -375,10 +375,17 @@ public function testRsaSigningString(): void
'privateKey' => $privateKey,
];
$auth = new Oauth();
$request = $auth->authentication($request, $options);

$result = $request->getHeaderLine('Authorization');
$this->assertSignatureFormat($result);
try {
$request = $auth->authentication($request, $options);
$result = $request->getHeaderLine('Authorization');
$this->assertSignatureFormat($result);
} catch (RuntimeException $e) {
// Handle 22.04 + OpenSSL bug. This should be safe to remove in the future.
if (strpos($e->getMessage(), 'unexpected eof while reading') !== false) {
$this->markTestSkipped('Skipping because of OpenSSL bug.');
}
throw $e;
}
}

public function testRsaSigningInvalidKey(): void
Expand Down
1 change: 1 addition & 0 deletions tests/TestCase/I18n/TimeTest.php
View file
Open in desktop
Expand Up @@ -927,6 +927,7 @@ public function assertTimeFormat(string $expected, string $result, string $messa
$expected = str_replace([',', '(', ')', ' at', ' م.', ' ه‍.ش.', ' AP', ' AH', ' SAKA', 'à '], '', $expected);
$expected = str_replace([' '], ' ', $expected);

$result = str_replace('temps universel coordonné', 'UTC', $result);
$result = str_replace('Temps universel coordonné', 'UTC', $result);
$result = str_replace('tiempo universal coordinado', 'GMT', $result);
$result = str_replace('Coordinated Universal Time', 'GMT', $result);
Expand Down