Merge branch 'master' into php5

* master:
  Properly skip SFTPLargeFileTest when environment variables not defined.
This commit is contained in:
Andreas Fischer 2014-12-12 22:22:23 +01:00
commit 30ef0e164f

View File

@ -41,8 +41,10 @@ class Functional_Net_SFTPLargeFileTest extends PhpseclibFunctionalTestCase
public function tearDown()
{
$this->sftp->chdir($this->getEnv('SSH_HOME'));
$this->sftp->delete($this->scratchDir);
if ($this->sftp) {
$this->sftp->chdir($this->getEnv('SSH_HOME'));
$this->sftp->delete($this->scratchDir);
}
parent::tearDown();
}