[Lock] fix locale dependent test case #27755
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chalasr
approved these changes
Jun 28, 2018
|
should be fixed by an OSX user : ) |
|
On OS X, IPC status from <running system> as of Fri Jun 29 17:43:01 CEST 2018
T ID KEY MODE OWNER GROUP
Semaphores:followed by a list of active semaphores. So a patch for OS X could be: diff --git a/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php
index 7057505..fb42e5a 100644
--- a/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php
@@ -50,6 +50,14 @@ class SemaphoreStoreTest extends AbstractStoreTest
private function getOpenedSemaphores()
{
+ if ('Darwin' === PHP_OS) {
+ $lines = explode(PHP_EOL, trim(`ipcs -s`));
+ if (-1 === $start = array_search('Semaphores:', $lines)) {
+ throw new \Exception('Failed to extract list of opend semaphores. Expect a Semaphore list, got '.implode(PHP_EOL, $lines));
+ }
+ return \count(\array_slice($lines, ++$start));
+ }
+
$lines = explode(PHP_EOL, trim(`LC_ALL=C ipcs -su`));
if ('------ Semaphore Status --------' !== $lines[0]) {
throw new \Exception('Failed to extract list of opend semaphores. Expect a Semaphore status, got '.implode(PHP_EOL, $lines)); |
nicolas-grekas
added a commit
that referenced
this pull request
Jun 29, 2018
This PR was merged into the 3.4 branch. Discussion ---------- [Lock] fix locale dependent test case | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Right now, I get a failure with `Exception: Failed to extract list of opend semaphores. Expect a Semaphore status, got ------ États des sémaphores --------` :) Commits ------- e665da0 [Lock] fix locale dependent test case
|
@ogizanagi PR welcome, the commit should be for you :) |
nicolas-grekas
added a commit
that referenced
this pull request
Jun 29, 2018
This PR was merged into the 3.4 branch. Discussion ---------- [Lock] Fix SemaphoreStoreTest on OS X | Q | A | ------------- | --- | Branch? | 3.4 <!-- see below --> | Bug fix? | no | New feature? | no <!-- don't forget to update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | #27755 (review) <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | N/A As spotted in #27755 (review), for OS X. If other OS X users could give it a try (`/phpunit src/Symfony/Component/Lock/ --filter=SemaphoreStoreTest`), that would be awesome. Commits ------- 9055611 [Lock] Fix SemaphoreStoreTest on OS X
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Right now, I get a failure with
Exception: Failed to extract list of opend semaphores. Expect a Semaphore status, got ------ États des sémaphores --------:)