Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f5235a9

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.3
* 4.4: Try making tests a bit less transient
2 parents 41c52bd + 366f40a commit f5235a9
Copy full SHA for f5235a9

File tree

Expand file treeCollapse file tree

5 files changed

+19
-13
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+19
-13
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ test_script:
6161
- copy /Y c:\php\php.ini-min c:\php\php.ini
6262
- IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit)
6363
- mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
64-
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
64+
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel!
6565
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6666
- copy /Y c:\php\php.ini-max c:\php\php.ini
67-
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
67+
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel!
6868
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6969
- exit %X%

‎src/Symfony/Component/Console/Tests/ApplicationTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/ApplicationTest.php
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,9 @@ public function testRenderExceptionLineBreaks()
883883
$this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_linebreaks.txt', $tester->getDisplay(true), '->renderException() keep multiple line breaks');
884884
}
885885

886+
/**
887+
* @group transient-on-windows
888+
*/
886889
public function testRenderAnonymousException()
887890
{
888891
$application = new Application();
@@ -906,6 +909,9 @@ public function testRenderAnonymousException()
906909
$this->assertStringContainsString('Dummy type "class@anonymous" is invalid.', $tester->getDisplay(true));
907910
}
908911

912+
/**
913+
* @group transient-on-windows
914+
*/
909915
public function testRenderExceptionStackTraceContainsRootException()
910916
{
911917
$application = new Application();

‎src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class RecursiveDirectoryIteratorTest extends IteratorTestCase
2121
public function testRewindOnFtp()
2222
{
2323
try {
24-
$i = new RecursiveDirectoryIterator('ftp://speedtest.tele2.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
24+
$i = new RecursiveDirectoryIterator('ftp://speedtest:speedtest@ftp.otenet.gr/', \RecursiveDirectoryIterator::SKIP_DOTS);
2525
} catch (\UnexpectedValueException $e) {
2626
$this->markTestSkipped('Unsupported stream "ftp".');
2727
}
@@ -37,14 +37,14 @@ public function testRewindOnFtp()
3737
public function testSeekOnFtp()
3838
{
3939
try {
40-
$i = new RecursiveDirectoryIterator('ftp://speedtest.tele2.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
40+
$i = new RecursiveDirectoryIterator('ftp://speedtest:speedtest@ftp.otenet.gr/', \RecursiveDirectoryIterator::SKIP_DOTS);
4141
} catch (\UnexpectedValueException $e) {
4242
$this->markTestSkipped('Unsupported stream "ftp".');
4343
}
4444

4545
$contains = [
46-
'ftp://speedtest.tele2.net'.\DIRECTORY_SEPARATOR.'1000GB.zip',
47-
'ftp://speedtest.tele2.net'.\DIRECTORY_SEPARATOR.'100GB.zip',
46+
'ftp://speedtest:speedtest@ftp.otenet.gr'.\DIRECTORY_SEPARATOR.'test100Mb.db',
47+
'ftp://speedtest:speedtest@ftp.otenet.gr'.\DIRECTORY_SEPARATOR.'test100k.db',
4848
];
4949
$actual = [];
5050

‎src/Symfony/Component/Lock/Tests/Store/PdoDbalStoreTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Lock/Tests/Store/PdoDbalStoreTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static function tearDownAfterClass(): void
4646
*/
4747
protected function getClockDelay()
4848
{
49-
return 1000000;
49+
return 1500000;
5050
}
5151

5252
/**

‎src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php

Copy file name to clipboardExpand all lines: src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -838,16 +838,16 @@ public function testTimeoutWithActiveConcurrentStream()
838838
public function testTimeoutOnInitialize()
839839
{
840840
$p1 = TestHttpServer::start(8067);
841-
$p2 = TestHttpServer::start(8077);
841+
$p2 = TestHttpServer::start(8078);
842842

843843
$client = $this->getHttpClient(__FUNCTION__);
844844
$start = microtime(true);
845845
$responses = [];
846846

847847
$responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
848-
$responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
848+
$responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
849849
$responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
850-
$responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
850+
$responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
851851

852852
try {
853853
foreach ($responses as $response) {
@@ -871,16 +871,16 @@ public function testTimeoutOnInitialize()
871871
public function testTimeoutOnDestruct()
872872
{
873873
$p1 = TestHttpServer::start(8067);
874-
$p2 = TestHttpServer::start(8077);
874+
$p2 = TestHttpServer::start(8078);
875875

876876
$client = $this->getHttpClient(__FUNCTION__);
877877
$start = microtime(true);
878878
$responses = [];
879879

880880
$responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
881-
$responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
881+
$responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
882882
$responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
883-
$responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
883+
$responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
884884

885885
try {
886886
while ($response = array_shift($responses)) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.