Fixups after conversion to Mercurial, fixing tests broken by the changes in the previous commit.

* Fixed differences in expected trace output caused by every test being
   wrapped in a transaction.
 * Fixed require-order bug in two of the specs
 * Corrected a mis-paste in the m17n spec before:all block

--HG--
branch : i17n-19-patches
This commit is contained in:
Michael Granger 2009-10-28 16:26:24 -07:00
parent cfd4a10192
commit 949dd32c2c
4 changed files with 11 additions and 11 deletions

3
.hgignore Normal file
View File

@ -0,0 +1,3 @@
\.(diff|patch)$
\.(s?o|log|bundle)$
ext/Makefile

View File

@ -23,4 +23,4 @@ From backend> Z
From backend (#4)> 5
From backend> Z
From backend (#4)> 5
From backend> I
From backend> T

View File

@ -1,13 +1,13 @@
#!/usr/bin/env spec
# encoding: utf-8
$LOAD_PATH.unshift('ext')
require 'pg'
require 'rubygems'
require 'spec'
require 'spec/lib/helpers'
$LOAD_PATH.unshift('ext')
require 'pg'
describe "multinationalization support" do
include PgTestingHelpers
@ -18,9 +18,7 @@ describe "multinationalization support" do
before( :all ) do
@conn = nil
if RUBY_VERSION_VEC >= MIN_RUBY_VERSION_VEC
before( :all ) do
@conn = setup_testing_db( "m17n" )
end
@conn = setup_testing_db( "m17n" )
@conn.exec( 'BEGIN' )
end
end

View File

@ -1,13 +1,13 @@
#!/usr/bin/env spec
# encoding: utf-8
$LOAD_PATH.unshift('ext')
require 'pg'
require 'rubygems'
require 'spec'
require 'spec/lib/helpers'
$LOAD_PATH.unshift('ext')
require 'pg'
describe PGconn do
include PgTestingHelpers
@ -75,7 +75,6 @@ describe PGconn do
# be careful to explicitly close files so that the
# directory can be removed and we don't have to wait for
# the GC to run.
expected_trace_file = File.join(Dir.getwd, "spec/data", "expected_trace.out")
expected_trace_data = open(expected_trace_file, 'rb').read
trace_file = open(File.join(@test_directory, "test_trace.out"), 'wb')