]> granicus.if.org Git - php/commitdiff
update for conflicting file test
authorGreg Beaver <cellog@php.net>
Sat, 29 May 2004 08:49:01 +0000 (08:49 +0000)
committerGreg Beaver <cellog@php.net>
Sat, 29 May 2004 08:49:01 +0000 (08:49 +0000)
pear/tests/pear_installer4.phpt

index c82d5d2e13a5199e80b03bb5db3e6f94a63b2ad4..445f5a37bf3f8f73815ebfc0f1bec24c18e8ee2e 100644 (file)
@@ -98,6 +98,10 @@ echo "goompness/oggbrzitzkee.php exists? ";
 echo (file_exists($temp_path . DIRECTORY_SEPARATOR . 'php'
     . DIRECTORY_SEPARATOR . 'groob' . DIRECTORY_SEPARATOR . 'goompness'
     . DIRECTORY_SEPARATOR . 'oggbrzitzkee.php')) ? "yes\n" : "no\n";
+
+echo "Test conflicting files:\n";
+$installer->install(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'test-pkg6' . DIRECTORY_SEPARATOR . 'conflictpackage.xml');
+
 echo "After uninstall:\n";
 $installer->uninstall('pkg6');
 var_dump($reg->listPackages());
@@ -216,6 +220,11 @@ array(1) {
 zoorb.php exists? yes
 goompness/Mopreeb.php exists? yes
 goompness/oggbrzitzkee.php exists? yes
+Test conflicting files:
+Caught error: pkg6conflict: conflicting files found:
+groob\goompness\oggbrzitzkee.php (pkg6)
+     groob\goompness\Mopreeb.php (pkg6)
+
 After uninstall:
 array(0) {
 }