From f908040d202b46780ac1c870633f5ac5ed95e756 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 30 Jul 2014 16:56:09 +0200 Subject: [PATCH 1/2] Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below). --- tests/Functional/Net/SFTPUserStoryTest.php | 6 ------ tests/Functional/Net/SSH2Test.php | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/tests/Functional/Net/SFTPUserStoryTest.php b/tests/Functional/Net/SFTPUserStoryTest.php index 707bc9ad..b5c57de1 100644 --- a/tests/Functional/Net/SFTPUserStoryTest.php +++ b/tests/Functional/Net/SFTPUserStoryTest.php @@ -14,12 +14,6 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase static public function setUpBeforeClass() { - if (getenv('TRAVIS') && version_compare(PHP_VERSION, '5.3.3', '<=')) { - self::markTestIncomplete( - 'This test hangs on Travis CI on PHP 5.3.3 and below.' - ); - } - parent::setUpBeforeClass(); self::$scratchDir = uniqid('phpseclib-sftp-scratch-'); diff --git a/tests/Functional/Net/SSH2Test.php b/tests/Functional/Net/SSH2Test.php index 4b7d552a..f4ce67a1 100644 --- a/tests/Functional/Net/SSH2Test.php +++ b/tests/Functional/Net/SSH2Test.php @@ -8,16 +8,6 @@ class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase { - public function setUp() - { - if (getenv('TRAVIS') && version_compare(PHP_VERSION, '5.3.3', '<=')) { - $this->markTestIncomplete( - 'This test hangs on Travis CI on PHP 5.3.3 and below.' - ); - } - parent::setUp(); - } - public function testConstructor() { $ssh = new Net_SSH2($this->getEnv('SSH_HOSTNAME')); From c9c68c9ca2bc57d96635845b2b09f173e4582a3c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 28 Jan 2015 13:58:10 +0100 Subject: [PATCH 2/2] .scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out. --- .scrutinizer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 4ad008a5..17c1ef32 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -4,3 +4,4 @@ imports: tools: external_code_coverage: runs: 5 # No Code Coverage on PHP 5.2 and HHVM + timeout: 2700 # 45 minutes