|
3 | 3 | use Behat\Behat\Context\Context; |
4 | 4 | use Behat\Gherkin\Node\PyStringNode; |
5 | 5 | use Flowpack\DecoupledContentStore\ContentReleaseManager; |
| 6 | +use Flowpack\DecoupledContentStore\Core\ConcurrentBuildLockService; |
6 | 7 | use Flowpack\DecoupledContentStore\Core\Domain\ValueObject\ContentReleaseIdentifier; |
7 | 8 | use Flowpack\DecoupledContentStore\Core\Domain\ValueObject\PrunnerJobId; |
8 | 9 | use Flowpack\DecoupledContentStore\Core\RedisKeyService; |
|
40 | 41 | use Neos\Utility\Arrays; |
41 | 42 | use Neos\Utility\ObjectAccess; |
42 | 43 | use PHPUnit\Framework\Assert; |
43 | | -use Psr\Log\Test\TestLogger; |
44 | 44 | use Symfony\Component\Console\Output\BufferedOutput; |
45 | 45 | use Symfony\Component\Yaml\Yaml; |
46 | 46 |
|
@@ -153,6 +153,8 @@ public function iCreateAContentRelease($contentReleaseIdentifier) |
153 | 153 | $prunnerJobId = PrunnerJobId::fromString("..."); |
154 | 154 | $logger = ContentReleaseLogger::fromSymfonyOutput($bufferedOutput, $contentReleaseIdentifier); |
155 | 155 | $redisContentReleaseService->createContentRelease($contentReleaseIdentifier, $prunnerJobId, $logger); |
| 156 | + $concurrentBuildLockService = $this->getObjectManager()->get(ConcurrentBuildLockService::class); |
| 157 | + $concurrentBuildLockService->ensureAllOtherInProgressContentReleasesWillBeTerminated($contentReleaseIdentifier); |
156 | 158 | echo $bufferedOutput->fetch(); |
157 | 159 | } |
158 | 160 |
|
@@ -406,13 +408,8 @@ public function iFlushTheContentCacheDependingOnTheModifiedNodes() |
406 | 408 | { |
407 | 409 | $contentCacheFlusher = $this->getObjectManager()->get(ContentCacheFlusher::class); |
408 | 410 |
|
409 | | - $testLogger = new TestLogger(); |
410 | | - ObjectAccess::setProperty($contentCacheFlusher, 'systemLogger', $testLogger, true); |
411 | 411 | $contentCacheFlusher->shutdownObject(); |
412 | 412 | ObjectAccess::setProperty($contentCacheFlusher, 'tagsToFlush', [], true); |
413 | | - foreach ($testLogger->records as $record) { |
414 | | - echo $record['message'] . "\n"; |
415 | | - } |
416 | 413 | } |
417 | 414 |
|
418 | 415 | /** |
|
0 commit comments