danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-04 18:48:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into php5

Browse Source 
* master:
  Use pwd instead of ls. If the directory is empty callback will not be called.
  Setup Travis CI phpseclib user home directory accordingly.
This commit is contained in:
Andreas Fischer 2014-04-07 18:16:20 +02:00
commit 4d8f056631
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Net/SSH2FunctionalTest.php
View File

@ -56,6 +56,6 @@ class Net_SSH2FunctionalTest extends PhpseclibFunctionalTestCase
->expects($this->atLeastOnce()) ->expects($this->atLeastOnce())
->method('callbackMethod') ->method('callbackMethod')
->will($this->returnValue(true)); ->will($this->returnValue(true));
$ssh->exec('ls', array($callbackObject, 'callbackMethod')); $ssh->exec('pwd', array($callbackObject, 'callbackMethod'));
} }
} }

2
travis/setup-secure-shell.sh
View File

@ -13,5 +13,5 @@ set -x
USERNAME='phpseclib' USERNAME='phpseclib'
PASSWORD='EePoov8po1aethu2kied1ne0' PASSWORD='EePoov8po1aethu2kied1ne0'
sudo useradd "$USERNAME" sudo useradd --create-home --base-dir /home "$USERNAME"
echo "$USERNAME:$PASSWORD" | sudo chpasswd echo "$USERNAME:$PASSWORD" | sudo chpasswd