Skip to content

Commit fa166ce

Browse files
boekkooiboekkooi
committed
- Tests cleanup for ScriptFileFilterIterator and ScriptFrontend
1 parent 3074497 commit fa166ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+419
-565
lines changed

‎tests/ScriptFileFilterIterator/basic.phpt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ $test->assertEquals('foobar', $files[0]['attribs']['name'], 'correct script file
2929
===DONE===
3030
--CLEAN--
3131
<?php
32-
$dir = __DIR__ . '/testit';
3332
include __DIR__ . '/../clean.php.inc';
3433
?>
3534
--EXPECT--

‎tests/ScriptFileFilterIterator/setup.php.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ $pf->files['foobar'] = array(
1616
$pf->files['glooby'] = array('role' => 'php');
1717
$pf->release[0]->installAs('foobar', 'blah/blah');
1818
$pf->release[0]->ignore('glooby');
19-
$pf->setPackagefile(__DIR__ . '/testit/package.xml');
19+
$pf->setPackagefile(TESTDIR . '/package.xml');
2020

2121
$package = new \PEAR2\Pyrus\Package(false);
2222
$xmlcontainer = new \PEAR2\Pyrus\PackageFile($pf);
23-
$xml = new \PEAR2\Pyrus\Package\Xml(__DIR__ . '/testit/package.xml', $package, $xmlcontainer);
23+
$xml = new \PEAR2\Pyrus\Package\Xml(TESTDIR . '/package.xml', $package, $xmlcontainer);
2424
$package->setInternalPackage($xml);

‎tests/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/Creator/Phar/PHPArchive.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ function __construct($path, $startupfile = false, $fileformat = Phar::PHAR, $com
2222
' PHP_Archive class for phar creation');
2323
}
2424
$phparchive = '?>' . $phparchive . '<?php';
25-
$template = @file_get_contents(dirname(__FILE__) . '/../../../../../../data/pear2.php.net/\PEAR2\Pyrus\Developer/phartemplate.php');
25+
$template = @file_get_contents(__DIR__ . '/../../../../../../data/pear2.php.net/\PEAR2\Pyrus\Developer/phartemplate.php');
2626
if (!$template) {
2727
$template = file_get_contents(__DIR__ . '/../../../../../data/phartemplate.php');
2828
}
2929
$this->stub = str_replace('@PHPARCHIVE@', $phparchive, $template);
3030
if ($startupfile === false) {
3131
$startupfile = '<?php
3232
$extract = getcwd();
33-
$loc = dirname(__FILE__);
34-
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__))) as $path => $file) {
33+
$loc = __DIR__;
34+
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__)) as $path => $file) {
3535
if ($file->getFileName() === \'__index.php\') {
3636
continue;
3737
}

‎tests/ScriptFrontend/Commands/build.phpt‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@ END;
1616
--FILE--
1717
<?php
1818
require __DIR__ . '/setup.php.inc';
19-
if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'testit')) {
20-
$dir = __DIR__ . '/testit';
19+
if (file_exists(TESTDIR)) {
20+
$dir = TESTDIR;
2121
include __DIR__ . '/../../clean.php.inc';
2222
}
23-
mkdir(__DIR__ . DIRECTORY_SEPARATOR . 'testit');
24-
set_include_path(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testit');
25-
$c = \PEAR2\Pyrus\Config::singleton(__DIR__.'/testit', __DIR__ . '/testit/plugins/pearconfig.xml');
26-
$c->bin_dir = __DIR__ . '/testit/bin';
27-
$c->ext_dir = __DIR__ . '/testit/ext';
23+
mkdir(TESTDIR);
24+
set_include_path(TESTDIR);
25+
$c = \PEAR2\Pyrus\Config::singleton(TESTDIR, TESTDIR . '/plugins/pearconfig.xml');
26+
$c->bin_dir = TESTDIR . '/bin';
27+
$c->ext_dir = TESTDIR . '/ext';
2828
restore_include_path();
2929
$c->saveConfig();
3030

3131
ob_start();
3232
$cli = new \PEAR2\Pyrus\ScriptFrontend\Commands(true);
33-
$cli->run($args = array (__DIR__ . '/testit', 'install', __DIR__.'/build/docblock-0.2.0.tar'));
33+
$cli->run($args = array (TESTDIR, 'install', __DIR__.'/build/docblock-0.2.0.tar'));
3434

3535
$contents = ob_get_contents();
3636
ob_end_clean();
37-
$test->assertEquals('Using PEAR installation found at ' . __DIR__. DIRECTORY_SEPARATOR . 'testit' . "\n"
37+
$test->assertEquals('Using PEAR installation found at ' . TESTDIR . "\n"
3838
. 'Installed pecl.php.net/docblock-0.2.0' . "\n"
3939
. " ==> To build this PECL package, use the build command\n",
4040
$contents,
@@ -45,21 +45,21 @@ $test->assertEquals('1.4.3', \PEAR2\Pyrus\Config::current()->registry->package['
4545
->dependencies['required']->pearinstaller->min, 'same after installation');
4646

4747
ob_start();
48-
$cli->run($args = array (__DIR__ . '/testit', 'build', 'pecl/docblock'));
48+
$cli->run($args = array (TESTDIR, 'build', 'pecl/docblock'));
4949
$contents = ob_get_contents();
5050
ob_end_clean();
5151

52-
$start = 'Using PEAR installation found at ' . __DIR__ . '/testit
52+
$start = 'Using PEAR installation found at ' . TESTDIR . '
5353
Building PECL extensions
54-
cleaning build directory ' . __DIR__ . '/testit/src/docblock
54+
cleaning build directory ' . TESTDIR . '/src/docblock
5555
running: phpize --clean 2>&1
5656
Cleaning..
57-
building in ' . __DIR__ . '/testit/src/docblock
57+
building in ' . TESTDIR . '/src/docblock
5858
running: phpize 2>&1
5959
Configuring for:';
6060

61-
$end = '@running: make INSTALL_ROOT="' . __DIR__ . '/testit/src/docblock/\.install" install 2>&1
62-
Installing shared extensions: ' . __DIR__ . '/testit/src/docblock/\.install' .
61+
$end = '@running: make INSTALL_ROOT="' . TESTDIR . '/src/docblock/\.install" install 2>&1
62+
Installing shared extensions: ' . TESTDIR . '/src/docblock/\.install' .
6363
\PEAR2\Pyrus\Config::current()->defaultValue('ext_dir') . '/
6464
\d+ \d drwxr\-xr\-x 3 \w+ \w+\s+4096 \d{4}\-\d{2}\-\d{2} \d{2}:\d{2} ' . __DIR__ .
6565
'/testit/src/docblock/\.install/usr
@@ -75,7 +75,7 @@ Installing shared extensions: ' . __DIR__ . '/testit/src/docblock/\.install'
7575
'/testit/src/docblock/\.install/usr/local/lib/php/extensions/[^/]+
7676
\d+ \d+ \-rwxr\-xr\-x 1 \w+ \w+\s+\d+ \d{4}\-\d{2}\-\d{2} \d{2}:\d{2} ' . __DIR__ .
7777
'/testit/src/docblock/\.install/usr/local/lib/php/extensions/[^/]+/docblock\.so
78-
Installing \'' . __DIR__ . '/testit/ext/docblock\.so\'
78+
Installing \'' . TESTDIR . '/ext/docblock\.so\'
7979
@';
8080

8181
$test->assertEquals($start, substr($contents, 0, strlen($start)), 'beginning of contents');
@@ -85,7 +85,6 @@ $test->assertRegex($end, substr($contents, strpos($contents, 'running: make INST
8585
===DONE===
8686
--CLEAN--
8787
<?php
88-
$dir = __DIR__ . '/testit';
8988
include __DIR__ . '/../../clean.php.inc';
9089
?>
9190
--EXPECT--

‎tests/ScriptFrontend/Commands/channelAdd.phpt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@
22
\PEAR2\Pyrus\ScriptFrontend\Commands::channelAdd()
33
--FILE--
44
<?php
5-
if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'testit')) {
6-
$dir = __DIR__ . '/testit';
7-
include __DIR__ . '/../../clean.php.inc';
8-
}
95
require __DIR__ . '/setup.php.inc';
106

117
$chan = \PEAR2\Pyrus\Config::current()->channelregistry['pecl.php.net'];
128
$newchan = $chan->toChannelFile();
139
$newchan->name = 'foobar';
1410
$newchan->alias = 'fb';
15-
file_put_contents(__DIR__ . '/testit/blah.xml', $newchan);
11+
file_put_contents(TESTDIR . '/blah.xml', $newchan);
1612
ob_start();
1713
$cli = new \PEAR2\Pyrus\ScriptFrontend\Commands(true);
18-
$cli->run($args = array (__DIR__ . '/testit', 'channel-add', __DIR__ . '/testit/blah.xml'));
14+
$cli->run($args = array (TESTDIR, 'channel-add', TESTDIR . '/blah.xml'));
1915

2016
$contents = ob_get_contents();
2117
ob_end_clean();
22-
$test->assertEquals('Using PEAR installation found at ' . __DIR__. DIRECTORY_SEPARATOR . 'testit' . "\n"
18+
$test->assertEquals('Using PEAR installation found at ' . TESTDIR . "\n"
2319
. "Adding channel from channel.xml:\n"
2420
. "Adding channel foobar successful\n",
2521
$contents,
@@ -30,7 +26,6 @@ $test->assertEquals('fb', $chan->alias, 'verify we got back what we added');
3026
===DONE===
3127
--CLEAN--
3228
<?php
33-
$dir = __DIR__ . '/testit';
3429
include __DIR__ . '/../../clean.php.inc';
3530
?>
3631
--EXPECT--

‎tests/ScriptFrontend/Commands/channelDel.phpt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
\PEAR2\Pyrus\ScriptFrontend\Commands::channelDel()
33
--FILE--
44
<?php
5-
if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'testit')) {
6-
$dir = __DIR__ . '/testit';
7-
include __DIR__ . '/../../clean.php.inc';
8-
}
95
require __DIR__ . '/setup.php.inc';
106

117
$chan = \PEAR2\Pyrus\Config::current()->channelregistry['pecl.php.net'];
@@ -17,11 +13,11 @@ $test->assertTrue(isset(\PEAR2\Pyrus\Config::current()->channelregistry['foobar'
1713

1814
ob_start();
1915
$cli = new \PEAR2\Pyrus\ScriptFrontend\Commands(true);
20-
$cli->run($args = array (__DIR__ . '/testit', 'channel-del', 'foobar'));
16+
$cli->run($args = array (TESTDIR, 'channel-del', 'foobar'));
2117

2218
$contents = ob_get_contents();
2319
ob_end_clean();
24-
$test->assertEquals('Using PEAR installation found at ' . __DIR__. DIRECTORY_SEPARATOR . 'testit' . "\n"
20+
$test->assertEquals('Using PEAR installation found at ' . TESTDIR . "\n"
2521
. "Deleting channel foobar successful\n",
2622
$contents,
2723
'delete channel');
@@ -30,7 +26,6 @@ $test->assertFalse(isset(\PEAR2\Pyrus\Config::current()->channelregistry['foobar
3026
===DONE===
3127
--CLEAN--
3228
<?php
33-
$dir = __DIR__ . '/testit';
3429
include __DIR__ . '/../../clean.php.inc';
3530
?>
3631
--EXPECT--

‎tests/ScriptFrontend/Commands/channelDiscover.fail.phpt‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,28 @@
22
\PEAR2\Pyrus\ScriptFrontend\Commands::channelDiscover() failure
33
--FILE--
44
<?php
5-
if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'testit')) {
6-
$dir = __DIR__ . '/testit';
7-
include __DIR__ . '/../../clean.php.inc';
8-
}
95
require __DIR__ . '/setup.php.inc';
106

11-
set_include_path(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testit');
12-
$c = \PEAR2\Pyrus\Config::singleton(__DIR__.'/testit', __DIR__ . '/testit/plugins/pearconfig.xml');
13-
$c->bin_dir = __DIR__ . '/testit/bin';
7+
set_include_path(TESTDIR);
8+
$c = \PEAR2\Pyrus\Config::singleton(TESTDIR, TESTDIR . '/plugins/pearconfig.xml');
9+
$c->bin_dir = TESTDIR . '/bin';
1410
restore_include_path();
1511
$c->saveConfig();
1612

1713
require __DIR__ . '/../../Mocks/Internet.php';
1814

19-
Internet::addDirectory(__DIR__ . '/testit',
15+
Internet::addDirectory(TESTDIR,
2016
'http://pear.unl.edu/');
2117
\PEAR2\Pyrus\Main::$downloadClass = 'Internet';
2218
$test->assertEquals(false, isset(\PEAR2\Pyrus\Config::current()->channelregistry['pear.unl.edu']),
2319
'before discover of pear.unl.edu');
2420
ob_start();
2521
$cli = new \PEAR2\Pyrus\ScriptFrontend\Commands(true);
26-
$cli->run($args = array (__DIR__ . '/testit', 'channel-discover', 'pear.unl.edu'));
22+
$cli->run($args = array (TESTDIR, 'channel-discover', 'pear.unl.edu'));
2723

2824
$contents = ob_get_contents();
2925
ob_end_clean();
30-
$test->assertEquals('Using PEAR installation found at ' . __DIR__. DIRECTORY_SEPARATOR . 'testit' . "\n"
26+
$test->assertEquals('Using PEAR installation found at ' . TESTDIR . "\n"
3127
. "Discovery of channel pear.unl.edu failed: Download of http://pear.unl.edu/channel.xml failed, file does not exist\n",
3228
$contents,
3329
'list packages');
@@ -38,7 +34,6 @@ $test->assertEquals(false, isset(\PEAR2\Pyrus\Config::current()->channelregistry
3834
===DONE===
3935
--CLEAN--
4036
<?php
41-
$dir = __DIR__ . '/testit';
4237
include __DIR__ . '/../../clean.php.inc';
4338
?>
4439
--EXPECT--

‎tests/ScriptFrontend/Commands/channelDiscover.fail2.phpt‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,30 @@
22
\PEAR2\Pyrus\ScriptFrontend\Commands::channelDiscover() failure
33
--FILE--
44
<?php
5-
if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'testit')) {
6-
$dir = __DIR__ . '/testit';
7-
include __DIR__ . '/../../clean.php.inc';
8-
}
95
require __DIR__ . '/setup.php.inc';
106

11-
set_include_path(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testit');
12-
$c = \PEAR2\Pyrus\Config::singleton(__DIR__.'/testit', __DIR__ . '/testit/plugins/pearconfig.xml');
13-
$c->bin_dir = __DIR__ . '/testit/bin';
7+
set_include_path(TESTDIR);
8+
$c = \PEAR2\Pyrus\Config::singleton(TESTDIR, TESTDIR . '/plugins/pearconfig.xml');
9+
$c->bin_dir = TESTDIR . '/bin';
1410
restore_include_path();
1511
$c->saveConfig();
1612

1713
require __DIR__ . '/../../Mocks/Internet.php';
1814

19-
Internet::addDirectory(__DIR__ . '/testit',
15+
Internet::addDirectory(TESTDIR,
2016
'https://pear.unl.edu/');
21-
Internet::addDirectory(__DIR__ . '/testit',
17+
Internet::addDirectory(TESTDIR,
2218
'http://pear.unl.edu/');
2319
\PEAR2\Pyrus\Main::$downloadClass = 'Internet';
2420
$test->assertEquals(false, isset(\PEAR2\Pyrus\Config::current()->channelregistry['pear.unl.edu']),
2521
'before discover of pear.unl.edu');
2622
ob_start();
2723
$cli = new \PEAR2\Pyrus\ScriptFrontend\Commands(true);
28-
$cli->run($args = array (__DIR__ . '/testit', 'channel-discover', 'pear.unl.edu'));
24+
$cli->run($args = array (TESTDIR, 'channel-discover', 'pear.unl.edu'));
2925

3026
$contents = ob_get_contents();
3127
ob_end_clean();
32-
$test->assertEquals('Using PEAR installation found at ' . __DIR__. DIRECTORY_SEPARATOR . 'testit' . "\n"
28+
$test->assertEquals('Using PEAR installation found at ' . TESTDIR . "\n"
3329
. "Discovery of channel pear.unl.edu failed: Download of http://pear.unl.edu/channel.xml failed, file does not exist\n",
3430
$contents,
3531
'list packages');
@@ -40,7 +36,6 @@ $test->assertEquals(false, isset(\PEAR2\Pyrus\Config::current()->channelregistry
4036
===DONE===
4137
--CLEAN--
4238
<?php
43-
$dir = __DIR__ . '/testit';
4439
include __DIR__ . '/../../clean.php.inc';
4540
?>
4641
--EXPECT--

‎tests/ScriptFrontend/Commands/channelDiscover.phpt‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@
22
\PEAR2\Pyrus\ScriptFrontend\Commands::channelDiscover()
33
--FILE--
44
<?php
5-
if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'testit')) {
6-
$dir = __DIR__ . '/testit';
7-
include __DIR__ . '/../../clean.php.inc';
8-
}
95
require __DIR__ . '/setup.php.inc';
106

11-
set_include_path(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testit');
12-
$c = \PEAR2\Pyrus\Config::singleton(__DIR__.'/testit', __DIR__ . '/testit/plugins/pearconfig.xml');
13-
$c->bin_dir = __DIR__ . '/testit/bin';
7+
set_include_path(TESTDIR);
8+
$c = \PEAR2\Pyrus\Config::singleton(TESTDIR, TESTDIR . '/plugins/pearconfig.xml');
9+
$c->bin_dir = TESTDIR . '/bin';
1410
restore_include_path();
1511
$c->saveConfig();
1612

1713
require __DIR__ . '/../../Mocks/Internet.php';
1814

19-
Internet::addDirectory(__DIR__ . '/testit',
15+
Internet::addDirectory(TESTDIR,
2016
'http://pear.unl.edu/');
2117
\PEAR2\Pyrus\Main::$downloadClass = 'Internet';
22-
file_put_contents(__DIR__ . '/testit/channel.xml', '<?xml version="1.0" encoding="UTF-8"?>
18+
file_put_contents(TESTDIR . '/channel.xml', '<?xml version="1.0" encoding="UTF-8"?>
2319
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
2420
<name>pear.unl.edu</name>
2521
<suggestedalias>salty</suggestedalias>
@@ -38,11 +34,11 @@ $test->assertEquals(false, isset(\PEAR2\Pyrus\Config::current()->channelregistry
3834
'before discover of pear.unl.edu');
3935
ob_start();
4036
$cli = new \PEAR2\Pyrus\ScriptFrontend\Commands(true);
41-
$cli->run($args = array (__DIR__ . '/testit', 'channel-discover', 'pear.unl.edu'));
37+
$cli->run($args = array (TESTDIR, 'channel-discover', 'pear.unl.edu'));
4238

4339
$contents = ob_get_contents();
4440
ob_end_clean();
45-
$test->assertEquals('Using PEAR installation found at ' . __DIR__. DIRECTORY_SEPARATOR . 'testit' . "\n"
41+
$test->assertEquals('Using PEAR installation found at ' . TESTDIR . "\n"
4642
. "Discovery of channel pear.unl.edu successful\n",
4743
$contents,
4844
'list packages');
@@ -53,7 +49,6 @@ $test->assertEquals(true, isset(\PEAR2\Pyrus\Config::current()->channelregistry[
5349
===DONE===
5450
--CLEAN--
5551
<?php
56-
$dir = __DIR__ . '/testit';
5752
include __DIR__ . '/../../clean.php.inc';
5853
?>
5954
--EXPECT--

‎tests/ScriptFrontend/Commands/channelDiscover2.phpt‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@
22
\PEAR2\Pyrus\ScriptFrontend\Commands::channelDiscover() https
33
--FILE--
44
<?php
5-
if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'testit')) {
6-
$dir = __DIR__ . '/testit';
7-
include __DIR__ . '/../../clean.php.inc';
8-
}
95
require __DIR__ . '/setup.php.inc';
106

11-
set_include_path(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'testit');
12-
$c = \PEAR2\Pyrus\Config::singleton(__DIR__.'/testit', __DIR__ . '/testit/plugins/pearconfig.xml');
13-
$c->bin_dir = __DIR__ . '/testit/bin';
7+
set_include_path(TESTDIR);
8+
$c = \PEAR2\Pyrus\Config::singleton(TESTDIR, TESTDIR . '/plugins/pearconfig.xml');
9+
$c->bin_dir = TESTDIR . '/bin';
1410
restore_include_path();
1511
$c->saveConfig();
1612

1713
require __DIR__ . '/../../Mocks/Internet.php';
1814

19-
Internet::addDirectory(__DIR__ . '/testit',
15+
Internet::addDirectory(TESTDIR,
2016
'https://pear.unl.edu/');
2117
\PEAR2\Pyrus\Main::$downloadClass = 'Internet';
22-
file_put_contents(__DIR__ . '/testit/channel.xml', '<?xml version="1.0" encoding="UTF-8"?>
18+
file_put_contents(TESTDIR . '/channel.xml', '<?xml version="1.0" encoding="UTF-8"?>
2319
<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
2420
<name>pear.unl.edu</name>
2521
<suggestedalias>salty</suggestedalias>
@@ -38,11 +34,11 @@ $test->assertEquals(false, isset(\PEAR2\Pyrus\Config::current()->channelregistry
3834
'before discover of pear.unl.edu');
3935
ob_start();
4036
$cli = new \PEAR2\Pyrus\ScriptFrontend\Commands(true);
41-
$cli->run($args = array (__DIR__ . '/testit', 'channel-discover', 'pear.unl.edu'));
37+
$cli->run($args = array (TESTDIR, 'channel-discover', 'pear.unl.edu'));
4238

4339
$contents = ob_get_contents();
4440
ob_end_clean();
45-
$test->assertEquals('Using PEAR installation found at ' . __DIR__. DIRECTORY_SEPARATOR . 'testit' . "\n"
41+
$test->assertEquals('Using PEAR installation found at ' . TESTDIR . "\n"
4642
. "Discovery of channel pear.unl.edu successful\n",
4743
$contents,
4844
'list packages');
@@ -53,7 +49,6 @@ $test->assertEquals(true, isset(\PEAR2\Pyrus\Config::current()->channelregistry[
5349
===DONE===
5450
--CLEAN--
5551
<?php
56-
$dir = __DIR__ . '/testit';
5752
include __DIR__ . '/../../clean.php.inc';
5853
?>
5954
--EXPECT--

0 commit comments

Comments
 (0)