Skip to content

Commit c9f92ba

Browse files
[2.3] Cherry-pick @group time-sensitive annotations
1 parent f14aa48 commit c9f92ba

File tree

13 files changed

+25
-238
lines changed

13 files changed

+25
-238
lines changed

src/Symfony/Component/Console/Tests/ClockMock.php

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,12 @@
1313

1414
use Symfony\Component\Console\Helper\ProgressHelper;
1515
use Symfony\Component\Console\Output\StreamOutput;
16-
use Symfony\Component\Console\Tests;
17-
18-
require_once __DIR__.'/../ClockMock.php';
1916

17+
/**
18+
* @group time-sensitive
19+
*/
2020
class ProgressHelperTest extends \PHPUnit_Framework_TestCase
2121
{
22-
protected function setUp()
23-
{
24-
Tests\with_clock_mock(true);
25-
}
26-
27-
protected function tearDown()
28-
{
29-
Tests\with_clock_mock(false);
30-
}
31-
3222
public function testAdvance()
3323
{
3424
$progress = new ProgressHelper();

src/Symfony/Component/HttpFoundation/Tests/ClockMockTestCase.php

Lines changed: 0 additions & 88 deletions
This file was deleted.

src/Symfony/Component/HttpFoundation/Tests/CookieTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
*
1919
* @author John Kary <[email protected]>
2020
* @author Hugo Hamon <[email protected]>
21+
*
22+
* @group time-sensitive
2123
*/
22-
class CookieTest extends ClockMockTestCase
24+
class CookieTest extends \PHPUnit_Framework_TestCase
2325
{
2426
public function invalidNames()
2527
{

src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
1515
use Symfony\Component\HttpFoundation\Cookie;
1616

17-
class ResponseHeaderBagTest extends ClockMockTestCase
17+
/**
18+
* @group time-sensitive
19+
*/
20+
class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
1821
{
1922
/**
2023
* @covers Symfony\Component\HttpFoundation\ResponseHeaderBag::allPreserveCase

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
1313

1414
use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcacheSessionHandler;
15-
use Symfony\Component\HttpFoundation\Tests\ClockMockTestCase;
1615

1716
/**
1817
* @requires extension memcache
18+
* @group time-sensitive
1919
*/
20-
class MemcacheSessionHandlerTest extends ClockMockTestCase
20+
class MemcacheSessionHandlerTest extends \PHPUnit_Framework_TestCase
2121
{
2222
const PREFIX = 'prefix_';
2323
const TTL = 1000;

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
1313

1414
use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler;
15-
use Symfony\Component\HttpFoundation\Tests\ClockMockTestCase;
1615

1716
/**
1817
* @requires extension memcached
18+
* @group time-sensitive
1919
*/
20-
class MemcachedSessionHandlerTest extends ClockMockTestCase
20+
class MemcachedSessionHandlerTest extends \PHPUnit_Framework_TestCase
2121
{
2222
const PREFIX = 'prefix_';
2323
const TTL = 1000;

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
1313

1414
use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler;
15-
use Symfony\Component\HttpFoundation\Tests\ClockMockTestCase;
1615

1716
/**
1817
* @author Markus Bachmann <[email protected]>
1918
* @requires extension mongo
19+
* @group time-sensitive
2020
*/
21-
class MongoDbSessionHandlerTest extends ClockMockTestCase
21+
class MongoDbSessionHandlerTest extends \PHPUnit_Framework_TestCase
2222
{
2323
/**
2424
* @var \PHPUnit_Framework_MockObject_MockObject

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
1313

1414
use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
15-
use Symfony\Component\HttpFoundation\Tests\ClockMockTestCase;
1615

1716
/**
1817
* @requires extension pdo_sqlite
18+
* @group time-sensitive
1919
*/
20-
class PdoSessionHandlerTest extends ClockMockTestCase
20+
class PdoSessionHandlerTest extends \PHPUnit_Framework_TestCase
2121
{
2222
private $pdo;
2323

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage;
1313

1414
use Symfony\Component\HttpFoundation\Session\Storage\MetadataBag;
15-
use Symfony\Component\HttpFoundation\Tests\ClockMockTestCase;
1615

1716
/**
1817
* Test class for MetadataBag.
18+
*
19+
* @group time-sensitive
1920
*/
20-
class MetadataBagTest extends ClockMockTestCase
21+
class MetadataBagTest extends \PHPUnit_Framework_TestCase
2122
{
2223
/**
2324
* @var MetadataBag

0 commit comments

Comments
 (0)