From 526a5c2ffb205dd4b2dc6f624dba7b674a3bfb0a Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 3 Apr 2014 11:18:22 +0200 Subject: [PATCH 1/2] Setup Travis CI phpseclib user home directory accordingly. --- travis/setup-secure-shell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/setup-secure-shell.sh b/travis/setup-secure-shell.sh index ad8d3504..8dd4e35f 100755 --- a/travis/setup-secure-shell.sh +++ b/travis/setup-secure-shell.sh @@ -13,5 +13,5 @@ set -x USERNAME='phpseclib' PASSWORD='EePoov8po1aethu2kied1ne0' -sudo useradd "$USERNAME" +sudo useradd --create-home --base-dir /home "$USERNAME" echo "$USERNAME:$PASSWORD" | sudo chpasswd From 96aaa262ebd39805ac4f95ad6946d8ae9bb5aa34 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 7 Apr 2014 17:58:49 +0200 Subject: [PATCH 2/2] Use pwd instead of ls. If the directory is empty callback will not be called. --- tests/Net/SSH2FunctionalTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Net/SSH2FunctionalTest.php b/tests/Net/SSH2FunctionalTest.php index 3078bd40..75ac304f 100644 --- a/tests/Net/SSH2FunctionalTest.php +++ b/tests/Net/SSH2FunctionalTest.php @@ -56,6 +56,6 @@ class Net_SSH2FunctionalTest extends PhpseclibFunctionalTestCase ->expects($this->atLeastOnce()) ->method('callbackMethod') ->will($this->returnValue(true)); - $ssh->exec('ls', array($callbackObject, 'callbackMethod')); + $ssh->exec('pwd', array($callbackObject, 'callbackMethod')); } }