Merge branch 'master' into php5

* master:
  .scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
  Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
This commit is contained in:
Andreas Fischer 2015-01-28 23:03:31 +01:00
commit 257d44331e
3 changed files with 1 additions and 16 deletions

View File

@ -4,3 +4,4 @@ imports:
tools:
external_code_coverage:
runs: 5 # No Code Coverage on PHP 5.2 and HHVM
timeout: 2700 # 45 minutes

View File

@ -16,12 +16,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-');

View File

@ -10,16 +10,6 @@ use phpseclib\Net\SSH2;
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 SSH2($this->getEnv('SSH_HOSTNAME'));