Merge branch 'master' into openssl-support

This commit is contained in:
terrafrost 2015-01-29 23:00:59 -06:00
commit 1dd1c65bfd
3 changed files with 1 additions and 16 deletions

View File

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

View File

@ -14,12 +14,6 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
static public function setUpBeforeClass() 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(); parent::setUpBeforeClass();
self::$scratchDir = uniqid('phpseclib-sftp-scratch-'); self::$scratchDir = uniqid('phpseclib-sftp-scratch-');

View File

@ -8,16 +8,6 @@
class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase 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() public function testConstructor()
{ {
$ssh = new Net_SSH2($this->getEnv('SSH_HOSTNAME')); $ssh = new Net_SSH2($this->getEnv('SSH_HOSTNAME'));