svn: /pecl/mysqlnd_ms/trunk/tests/ mysqlnd_ms_gtid_report_errors_on.phpt mysqlnd_ms_gtid_report_errors_on_non_lazy.phpt
| From: | Ulf Wendel | Date: | Wed, 07 Dec 2011 18:33:14 +0000 |
| Subject: | svn: /pecl/mysqlnd_ms/trunk/tests/ mysqlnd_ms_gtid_report_errors_on.phpt mysqlnd_ms_gtid_report_errors_on_non_lazy.phpt | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-17314@lists.php.net to get a copy of this message | ||
uw Wed, 07 Dec 2011 18:33:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=320599
Log:
More test fixes. Tests shall not break replication setups
Changed paths:
U pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_gtid_report_errors_on.phpt
U pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_gtid_report_errors_on_non_lazy.phpt
Modified: pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_gtid_report_errors_on.phpt
===================================================================
--- pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_gtid_report_errors_on.phpt 2011-12-07 18:22:09 UTC (rev
320598)
+++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_gtid_report_errors_on.phpt 2011-12-07 18:33:14 UTC (rev
320599)
@@ -6,7 +6,7 @@
die(sprintf("SKIP Requires PHP >= 5.3.99, using " . PHP_VERSION));
require_once('skipif.inc');
- require_once("connect.inc");
+require_once("connect.inc");
_skipif_check_extensions(array("mysqli"));
_skipif_connect($master_host_only, $user, $passwd, $db, $master_port, $master_socket);
@@ -15,7 +15,7 @@
include_once("util.inc");
$sql = mst_get_gtid_sql($db);
if ($error = mst_mysqli_setup_gtid_table($master_host_only, $user, $passwd, $db, $master_port,
$master_socket))
- die(sprintf("SKIP Failed to setup GTID on master, %s\n", $error));
+ die(sprintf("SKIP Failed to setup GTID on master, %s\n", $error));
$link = mst_mysqli_connect($master_host_only, $user, $passwd, $db, $master_port, $master_socket);
@@ -204,6 +204,8 @@
if (!unlink("test_mysqlnd_ms_gtid_report_errors_on.ini"))
printf("[clean] Cannot unlink ini file
'test_mysqlnd_ms_gtid_report_errors_on.ini'.\n");
+ require_once("connect.inc");
+ require_once("util.inc");
if ($error = mst_mysqli_drop_gtid_table($master_host_only, $user, $passwd, $db, $master_port,
$master_socket))
printf("[clean] %s\n", $error));
?>
Modified: pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_gtid_report_errors_on_non_lazy.phpt
===================================================================
--- pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_gtid_report_errors_on_non_lazy.phpt 2011-12-07 18:22:09
UTC (rev 320598)
+++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_gtid_report_errors_on_non_lazy.phpt 2011-12-07 18:33:14
UTC (rev 320599)
@@ -14,7 +14,10 @@
include_once("util.inc");
$sql = mst_get_gtid_sql($db);
+if ($error = mst_mysqli_setup_gtid_table($master_host_only, $user, $passwd, $db, $master_port,
$master_socket))
+ die(sprintf("SKIP Failed to setup GTID on master, %s\n", $error));
+
$link = mst_mysqli_connect($master_host_only, $user, $passwd, $db, $master_port, $master_socket);
if (mysqli_connect_errno())
die(sprintf("SKIP [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
@@ -165,6 +168,11 @@
<?php
if (!unlink("test_mysqlnd_ms_gtid_report_errors_on_non_lazy.ini"))
printf("[clean] Cannot unlink ini file
'test_mysqlnd_ms_gtid_report_errors_on_non_lazy.ini'.\n");
+
+ require_once("connect.inc");
+ require_once("util.inc");
+ if ($error = mst_mysqli_drop_gtid_table($master_host_only, $user, $passwd, $db, $master_port,
$master_socket))
+ printf("[clean] %s\n", $error));
?>
--EXPECTF--
[005] [1146] %s