com php-src: fix mysql tests & mark nextRowset problematic tests: .travis.yml ext/mysql/tests/bug55473.phpt ext/pdo_mysql/tests /bug_39858.phpt
ext/pdo_mysql/tests/bug_4 1997.phpt ext/pdo_mysql/tests/pdo_mysql__ _construct.phpt ext/pdo_mysql/tests/pdo_mysql_pconn ect.phpt
ext/pdo_mysql/tests/pdo_mysql_stmt_nextrow set.phpt ext/pdo_mysql/tests/pdo_mysql_stmt_variabl e_columncount.phpt
| From: | Stanislav Malyshev | Date: | Sun, 25 Aug 2013 06:56:48 +0000 |
| Subject: | com php-src: fix mysql tests & mark nextRowset problematic tests: .travis.yml ext/mysql/tests/bug55473.phpt ext/pdo_mysql/tests /bug_39858.phpt ext/pdo_mysql/tests/bug_4 1997.phpt ext/pdo_mysql/tests/pdo_mysql__ _construct.phpt ext/pdo_mysql/tests/pdo_mysql_pconn ect.phpt ext/pdo_mysql/tests/pdo_mysql_stmt_nextrow set.phpt ext/pdo_mysql/tests/pdo_mysql_stmt_variabl e_columncount.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73105@lists.php.net to get a copy of this message | ||
Commit: a2d8ae9a1fa9704707ac9dcc293de639d4824eab
Author: Stanislav Malyshev <stas@php.net> Sat, 24 Aug 2013 23:14:48 -0700
Parents: 817eebc733ab64852534b33bdd2868fae2c1a1d8
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a2d8ae9a1fa9704707ac9dcc293de639d4824eab
Log:
fix mysql tests & mark nextRowset problematic tests
Changed paths:
M .travis.yml
M ext/mysql/tests/bug55473.phpt
M ext/pdo_mysql/tests/bug_39858.phpt
M ext/pdo_mysql/tests/bug_41997.phpt
M ext/pdo_mysql/tests/pdo_mysql___construct.phpt
M ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
M ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
M ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
Diff:
diff --git a/.travis.yml b/.travis.yml
index b614940..d149772 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ env:
- PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
- PDO_MYSQL_TEST_USER=travis
- PDO_MYSQL_TEST_PASS=
+ - PDO_MYSQL_TEST_HOST=127.0.0.1
matrix:
- REPORT_EXIT_STATUS=1
diff --git a/ext/mysql/tests/bug55473.phpt b/ext/mysql/tests/bug55473.phpt
index 1cc2dc9..98fd009 100644
--- a/ext/mysql/tests/bug55473.phpt
+++ b/ext/mysql/tests/bug55473.phpt
@@ -69,18 +69,26 @@ mysql.allow_persistent=1
?>
--EXPECTF--
Deprecated: mysql_pconnect(): The mysql extension is deprecated and will be removed in the future:
use mysqli or PDO instead in %s on line %d
+
+Warning: mysql_ping(): MySQL server has gone away in %s on line %d
[003] reconnect 0
Deprecated: mysql_pconnect(): The mysql extension is deprecated and will be removed in the future:
use mysqli or PDO instead in %s on line %d
[005] Setting openened files...
+
+Warning: mysql_ping(): MySQL server has gone away in %s on line %d
[003] reconnect 1
Deprecated: mysql_pconnect(): The mysql extension is deprecated and will be removed in the future:
use mysqli or PDO instead in %s on line %d
[007] Opened files as expected
+
+Warning: mysql_ping(): MySQL server has gone away in %s on line %d
[003] reconnect 2
Deprecated: mysql_pconnect(): The mysql extension is deprecated and will be removed in the future:
use mysqli or PDO instead in %s on line %d
[007] Opened files as expected
+
+Warning: mysql_ping(): MySQL server has gone away in %s on line %d
[003] reconnect 3
Deprecated: mysql_pconnect(): The mysql extension is deprecated and will be removed in the future:
use mysqli or PDO instead in %s on line %d
diff --git a/ext/pdo_mysql/tests/bug_39858.phpt b/ext/pdo_mysql/tests/bug_39858.phpt
index 4745718..cb9cafd 100644
--- a/ext/pdo_mysql/tests/bug_39858.phpt
+++ b/ext/pdo_mysql/tests/bug_39858.phpt
@@ -18,6 +18,8 @@ if ($version < 50000)
die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
$matches[0], $matches[1], $matches[2], $version));
?>
+--XFAIL--
+nextRowset() problem with stored proc & emulation mode & mysqlnd
--FILE--
<?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
diff --git a/ext/pdo_mysql/tests/bug_41997.phpt b/ext/pdo_mysql/tests/bug_41997.phpt
index 38d55a0..56cbe4b 100644
--- a/ext/pdo_mysql/tests/bug_41997.phpt
+++ b/ext/pdo_mysql/tests/bug_41997.phpt
@@ -1,5 +1,7 @@
--TEST--
PDO MySQL Bug #41997 (stored procedure call returning single rowset blocks future queries)
+--XFAIL--
+nextRowset() problem with stored proc & emulation mode & mysqlnd
--SKIPIF--
<?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
index c3f12df..0cabfe6 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
@@ -49,7 +49,8 @@ MySQLPDOTest::skip();
// should fail
$dsn = 'mysql:';
- print tryandcatch(10, '$db = new PDO("' . $dsn . '", "' .
$user . '", "' . $pass . '");');
+ // don't print the message since it can be different
+ tryandcatch(10, '$db = new PDO("' . $dsn . '", "' . $user .
'", "' . $pass . '");');
$dsn = PDO_MYSQL_TEST_DSN;
$user = PDO_MYSQL_TEST_USER;
@@ -57,14 +58,15 @@ MySQLPDOTest::skip();
// should work...
$db = new PDO($dsn, $user, $pass);
+ // Reaction on host not specified differs for different configs, so no printing
$dsn = 'mysql:invalid=foo';
- print tryandcatch(11, '$db = new PDO("' . $dsn . '", "' .
$user . '", "' . $pass . '");');
+ tryandcatch(11, '$db = new PDO("' . $dsn . '", "' . $user .
'", "' . $pass . '");');
$dsn = 'mysql:' . str_repeat('howmuch=canpdoeat;', 1000);
- print tryandcatch(12, '$db = new PDO("' . $dsn . '", "' .
$user . '", "' . $pass . '");');
+ tryandcatch(12, '$db = new PDO("' . $dsn . '", "' . $user .
'", "' . $pass . '");');
$dsn = 'mysql:' . str_repeat('abcdefghij', 1024 * 10) .
'=somevalue';
- print tryandcatch(13, '$db = new PDO("' . $dsn . '", "' .
$user . '", "' . $pass . '");');
+ tryandcatch(13, '$db = new PDO("' . $dsn . '", "' . $user .
'", "' . $pass . '");');
if (PDO_MYSQL_TEST_HOST) {
$host = PDO_MYSQL_TEST_HOST;
@@ -295,6 +297,5 @@ MySQLPDOTest::skip();
[006] invalid data source name, [n/a] n/a
[007] could not find driver, [n/a] n/a
[009] SQLSTATE[%s] [1045] Access denied for user 'dont%s'@'%s' (using password:
YES), [n/a] n/a
-[010] SQLSTATE[%s] [1045] Access denied for user 'dont%s'@'%s' (using password:
YES), [n/a] n/a
[017] DSN=%s, SQLSTATE[%s] [%d] %s
done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
index eb0fff1..5990ab8 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
@@ -64,7 +64,7 @@ MySQLPDOTest::skip();
$tmp = $stmt->fetch(PDO::FETCH_ASSOC);
$con1 = $tmp['_con1'];
- $db2 = new PDO($dsn, $user, $pass, array(PDO::ATTR_PERSISTENT => true));
+ @$db2 = new PDO($dsn, $user, $pass, array(PDO::ATTR_PERSISTENT => true));
$stmt = $db2->query('SELECT CONNECTION_ID() as _con2');
$tmp = $stmt->fetch(PDO::FETCH_ASSOC);
$con2 = $tmp['_con2'];
@@ -94,4 +94,4 @@ MySQLPDOTest::skip();
print "done!";
?>
--EXPECTF--
-done!
\ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
index 7996245..9165e70 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
@@ -1,5 +1,7 @@
--TEST--
MySQL PDOStatement->nextRowSet()
+--XFAIL--
+nextRowset() problem with stored proc & emulation mode & mysqlnd
--SKIPIF--
<?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
@@ -310,4 +312,4 @@ array(3) {
}
}
bool(false)
-done!
\ No newline at end of file
+done!
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
index c34f4a9..e58d4a6 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
@@ -1,5 +1,7 @@
--TEST--
MySQL Prepared Statements and different column counts
+--XFAIL--
+nextRowset() problem with stored proc & emulation mode & mysqlnd
--SKIPIF--
<?php
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
@@ -120,4 +122,4 @@ if ($version < 50000)
print "done!";
?>
--EXPECTF--
-done!
\ No newline at end of file
+done!