cvs: pear /MDB2/tests MDB2_manager_testcase.php
| From: | Daniel Convissor | Date: | Sun, 07 Nov 2004 23:10:57 +0000 |
| Subject: | cvs: pear /MDB2/tests MDB2_manager_testcase.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-25750@lists.php.net to get a copy of this message | ||
danielc Sun Nov 7 18:10:57 2004 EDT
Modified files:
/pear/MDB2/tests MDB2_manager_testcase.php
Log:
* Merge the expects for mssql and others.
http://cvs.php.net/diff.php/pear/MDB2/tests/MDB2_manager_testcase.php?r1=1.7&r2=1.8&ty=u
Index: pear/MDB2/tests/MDB2_manager_testcase.php
diff -u pear/MDB2/tests/MDB2_manager_testcase.php:1.7 pear/MDB2/tests/MDB2_manager_testcase.php:1.8
--- pear/MDB2/tests/MDB2_manager_testcase.php:1.7 Sun Nov 7 12:22:49 2004
+++ pear/MDB2/tests/MDB2_manager_testcase.php Sun Nov 7 18:10:55 2004
@@ -41,7 +41,7 @@
// | Author: Paul Cooper <pgc@ucecom.com> |
// +----------------------------------------------------------------------+
//
-// $Id: MDB2_manager_testcase.php,v 1.7 2004/11/07 17:22:49 danielc Exp $
+// $Id: MDB2_manager_testcase.php,v 1.8 2004/11/07 23:10:55 danielc Exp $
require_once 'MDB2/Tools/Manager.php';
@@ -107,11 +107,8 @@
if (!$this->methodExists($this->manager->db->manager,
'dropDatabase')) {
return;
}
- if ($this->manager->db->phptype == 'mssql') {
- $this->manager->db->expectError(MDB2_ERROR_NOSUCHTABLE);
- } else {
- $this->manager->db->expectError(MDB2_ERROR_CANNOT_DROP);
- }
+ $this->manager->db->expectError(array(MDB2_ERROR_CANNOT_DROP,
+ MDB2_ERROR_NOSUCHTABLE));
$result = $this->manager->db->manager->dropDatabase($this->database);
$this->manager->db->popExpect();
if (!MDB2::isError($result) || $result->getCode() != MDB2_ERROR_UNSUPPORTED) {