diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e84787e53f2..3ab02662b91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ on: jobs: testsuite: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: diff --git a/tests/TestCase/Http/Client/Auth/OauthTest.php b/tests/TestCase/Http/Client/Auth/OauthTest.php index 09e53b03b1c..f2d03a25e9b 100644 --- a/tests/TestCase/Http/Client/Auth/OauthTest.php +++ b/tests/TestCase/Http/Client/Auth/OauthTest.php @@ -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 diff --git a/tests/TestCase/I18n/TimeTest.php b/tests/TestCase/I18n/TimeTest.php index 20c35559baf..9b3c9b4d431 100644 --- a/tests/TestCase/I18n/TimeTest.php +++ b/tests/TestCase/I18n/TimeTest.php @@ -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);