From: Marcus Boerger <helly@php.net>
Date: Sat, 31 Dec 2005 17:42:39 +0000 (+0000)
Subject: - MFH Fix tests
X-Git-Tag: php-5.1.2RC2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=847954692085d7bdc564a9bc4414fdfefb75c571;p=php

- MFH Fix tests
---

diff --git a/ext/pdo_pgsql/tests/bug_33876.phpt b/ext/pdo_pgsql/tests/bug_33876.phpt
index 725d44db9d..fc9d20f696 100644
--- a/ext/pdo_pgsql/tests/bug_33876.phpt
+++ b/ext/pdo_pgsql/tests/bug_33876.phpt
@@ -13,6 +13,7 @@ require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
 $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 
+$db->exec("SET LC_MESSAGES='C'");
 $db->exec('CREATE TABLE test (foo varchar(5) NOT NULL, bar bool NOT NULL)');
 $db->exec("INSERT INTO test VALUES('false','f')");
 $db->exec("INSERT INTO test VALUES('true', 't')");
diff --git a/ext/pgsql/tests/09notice.phpt b/ext/pgsql/tests/09notice.phpt
index ccb0c80823..b7611b98c1 100644
--- a/ext/pgsql/tests/09notice.phpt
+++ b/ext/pgsql/tests/09notice.phpt
@@ -10,6 +10,7 @@ pgsql.ignore_notices=0
 include 'config.inc';
 
 $db = pg_connect($conn_str);
+pg_exec($db, "SET LC_MESSAGES='C';");
 pg_query($db, "BEGIN;");
 pg_query($db, "BEGIN;");
 
diff --git a/ext/pgsql/tests/80_bug32223.phpt b/ext/pgsql/tests/80_bug32223.phpt
index a605fcc20b..b201d320ce 100755
--- a/ext/pgsql/tests/80_bug32223.phpt
+++ b/ext/pgsql/tests/80_bug32223.phpt
@@ -22,6 +22,7 @@ $dbh = @pg_connect($conn_str);
 if (!$dbh) {
 	die ("Could not connect to the server");
 }
+pg_exec($dbh, "SET LC_MESSAGES='C';");
 
 //@pg_query($dbh, "CREATE LANGUAGE 'plpgsql' HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL'");
 $res = pg_query($dbh, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS '
diff --git a/ext/pgsql/tests/80_bug32223b.phpt b/ext/pgsql/tests/80_bug32223b.phpt
index 010915e82c..98e4723889 100755
--- a/ext/pgsql/tests/80_bug32223b.phpt
+++ b/ext/pgsql/tests/80_bug32223b.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #32223 (weird behaviour of pg_last_notice using notice)
+Bug #32223 (weird behaviour of pg_last_notice using define)
 --SKIPIF--
 <?php 
 require_once('skipif.inc');
@@ -16,13 +16,13 @@ if (!$res) die('skip PLPGSQL not available');
 --FILE--
 <?php
 
-require('config.inc');
+require_once('config.inc');
 
-define ('dbh', pg_connect($conn_str));
-//$dbh = @pg_connect($conn_str);
+define('dbh', pg_connect($conn_str));
 if (!dbh) {
         die ("Could not connect to the server");
 }
+pg_exec(dbh, "SET LC_MESSAGES='C';");
 
 //@pg_query(dbh, "CREATE LANGUAGE 'plpgsql' HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL'");
 $res = pg_query(dbh, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS '