com php-src: test fixes: ext/mysqli/tests/mysqli_fetch_fiel d_flags.phpt ext/pdo_mysql/tests/pdo_mysql_pconnect .phpt
| From: | Ferenc Kovacs | Date: | Wed, 01 Apr 2015 20:07:52 +0000 |
| Subject: | com php-src: test fixes: ext/mysqli/tests/mysqli_fetch_fiel d_flags.phpt ext/pdo_mysql/tests/pdo_mysql_pconnect .phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86033@lists.php.net to get a copy of this message | ||
Commit: 0a41af216ecabf76b54a78783b7cac01ca353ef9
Author: Ferenc Kovacs <tyrael@php.net> Wed, 1 Apr 2015 22:03:19 +0200
Parents: 9ec3e7d98c24903f545e031f7a0acd617994862c
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0a41af216ecabf76b54a78783b7cac01ca353ef9
Log:
test fixes
Changed paths:
M ext/mysqli/tests/mysqli_fetch_field_flags.phpt
M ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
Diff:
diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
index 8259d2f..06b936a 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
@@ -199,7 +199,6 @@ mysqli_close($link);
if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
printf("[008] %s [%d] %s\n", $column_def,
mysqli_errno($link), mysqli_error($link));
- continue;
}
$column_def = array('col1 CHAR(1)', 'col2 CHAR(2)','INDEX
idx_col1_col2(col1, col2)');
@@ -220,7 +219,6 @@ mysqli_close($link);
while ($field = mysqli_fetch_field($res)) {
if (!isset($expected_flags[$field->name])) {
printf("[010] Found unexpected field '%s'\n", $field->name);
- continue;
}
list($missing_flags, $unexpected_flags, $flags_found) = checkFlags($field->flags,
$expected_flags[$field->name], $flags);
if ($unexpected_flags)
diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect..phpt
b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
index 5990ab8..12699c5 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
@@ -85,10 +85,10 @@ MySQLPDOTest::skip();
} catch (PDOException $e) {
- printf("[001] %s, [%s] %s\n",
+ printf("[001] %s, [%s] %s [%s] %s\n",
$e->getMessage(),
- (is_object($db)) ? $db->errorCode() : 'n/a',
- (is_object($db)) ? implode(' ', $db->errorInfo()) : 'n/a');
+ (is_object($db1)) ? $db1->errorCode() : 'n/a',
+ (is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a');
}
print "done!";