From: Roland Mas Date: Wed, 7 Nov 2012 15:24:17 +0000 (+0100) Subject: Let's be quiet there X-Git-Tag: v5.3-rc1~1781 X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=817c49c7fd08ca506e9a123a9fcaf7f7f4ad4bbd Let's be quiet there --- diff --git a/tests/func/PluginsScmBzr/bzrTest.php b/tests/func/PluginsScmBzr/bzrTest.php index afeb13a..ebf89f5 100644 --- a/tests/func/PluginsScmBzr/bzrTest.php +++ b/tests/func/PluginsScmBzr/bzrTest.php @@ -60,17 +60,17 @@ class ScmBzrTest extends FForge_SeleniumTestCase $p = preg_replace(",/branchname$,", "", $p); // Create a local branch, push it to the repo - $t = system("mktemp -d /tmp/bzrTest.XXXXXX"); - system("cd $t && bzr init trunk &>/dev/null", $ret); + $t = exec("mktemp -d /tmp/bzrTest.XXXXXX"); + system("cd $t && bzr init --quiet trunk >/dev/null", $ret); $this->assertEquals($ret, 0); system("echo 'this is a simple text' > $t/trunk/mytext.txt"); - system("cd $t/trunk && bzr add --quiet &>/dev/null && bzr commit -m'Adding file' --quiet &>/dev/null", $ret); + system("cd $t/trunk && bzr add --quiet && bzr commit -m'Adding file' --quiet", $ret); system("echo 'another simple text' >> $t/trunk/mytext.txt"); - system("cd $t/trunk && bzr add --quiet &>/dev/null && bzr commit -m'Modifying file' --quiet &>/dev/null", $ret); + system("cd $t/trunk && bzr add --quiet && bzr commit -m'Modifying file' --quiet", $ret); $this->assertEquals($ret, 0); - system("cd $t/trunk && BZR_PROGRESS_BAR=none bzr push --quiet $p/trunk &>/dev/null", $ret); + system("cd $t/trunk && bzr push --quiet $p/trunk", $ret); $this->assertEquals($ret, 0); $this->open(ROOT.'/scm/loggerhead/projecta');