Skip to content

Commit

Permalink
Merge pull request #315 from bantu/php5.3.3-ssh-functional-tests-reen…
Browse files Browse the repository at this point in the history
…able

Reenable SSH Functional Test on Travis CI PHP 5.3.3 and below.

* bantu/php5.3.3-ssh-functional-tests-reenable:
  Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
  • Loading branch information
bantu committed Jan 28, 2015
2 parents d874248 + f908040 commit d15bba1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
6 changes: 0 additions & 6 deletions tests/Functional/Net/SFTPUserStoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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-');
Expand Down
10 changes: 0 additions & 10 deletions tests/Functional/Net/SSH2Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down

0 comments on commit d15bba1

Please sign in to comment.