From: Greg Beaver <cellog@php.net>
Date: Sat, 29 May 2004 08:49:01 +0000 (+0000)
Subject: update for conflicting file test
X-Git-Tag: php-5.0.0RC3RC2~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c5c17c3a12c5c010860d95e5456d0d2de1c2f08;p=php

update for conflicting file test
---

diff --git a/pear/tests/pear_installer4.phpt b/pear/tests/pear_installer4.phpt
index c82d5d2e13..445f5a37bf 100644
--- a/pear/tests/pear_installer4.phpt
+++ b/pear/tests/pear_installer4.phpt
@@ -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) {
 }