pg 0.9.0-x86-mingw32 → 0.11.0pre229-x86-mingw32

data/rake/testing.rb

@@ -16,7 +16,7 @@ end
 SPEC_FILES       = [] unless defined?( SPEC_FILES )
 TEST_FILES       = [] unless defined?( TEST_FILES )
 
-COMMON_SPEC_OPTS = ['-Du'] unless defined?( COMMON_SPEC_OPTS )
+COMMON_RSPEC_OPTS = [] unless defined?( COMMON_RSPEC_OPTS )
 
 COVERAGE_TARGETDIR = BASEDIR + 'coverage' unless defined?( COVERAGE_TARGETDIR )
 RCOV_EXCLUDES      = 'spec,tests,/Library/Ruby,/var/lib,/usr/local/lib' unless
@@ -39,149 +39,114 @@ end
 
 ### RSpec specifications
 begin
-	gem 'rspec', '>= 1.1.3'
+	gem 'rspec', '>= 2.0.0'
 
-	require 'spec'
-	require 'spec/rake/spectask'
+	require 'rspec'
+	require 'rspec/core/rake_task'
 
 	### Task: spec
 	desc "Run specs"
 	task :spec => 'spec:doc'
+	task :specs => :spec
 
 	namespace :spec do
 		desc "Run rspec every time there's a change to one of the files"
 		task :autotest do
-			require 'autotest/rspec'
-
-			autotester = Autotest::Rspec.new
-			autotester.run
+			require 'autotest'
+			Autotest.add_discovery { "rspec2" }
+			Autotest.run
 		end
 
 		desc "Generate regular color 'doc' spec output"
-		Spec::Rake::SpecTask.new( :doc ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 's', '-c']
+		RSpec::Core::RakeTask.new( :doc ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'd', '-c']
 		end
 
 		desc "Generate spec output with profiling"
-		Spec::Rake::SpecTask.new( :profile ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 'o']
+		RSpec::Core::RakeTask.new( :profile ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'p', '-p']
 		end
 
 		desc "Generate quiet non-colored plain-text output"
-		Spec::Rake::SpecTask.new( :quiet ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 'p']
+		RSpec::Core::RakeTask.new( :quiet ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'p']
 		end
 
 		desc "Generate HTML output"
-		Spec::Rake::SpecTask.new( :html ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 'h']
+		RSpec::Core::RakeTask.new( :html ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'h']
 		end
 
-	end
-rescue LoadError => err
-	task :no_rspec do
-		$stderr.puts "Specification tasks not defined: %s" % [ err.message ]
-	end
-
-	task :spec => :no_rspec
-	namespace :spec do
-		task :autotest => :no_rspec
-		task :doc => :no_rspec
-		task :profile => :no_rspec
-		task :quiet => :no_rspec
-		task :html => :no_rspec
-	end
-end
-
-
-### Test::Unit tests
-begin
-	require 'rake/testtask'
-
-	Rake::TestTask.new( :unittests ) do |task|
-		task.libs += [LIBDIR]
-		task.test_files = TEST_FILES
-		task.verbose = true
-	end
 
-rescue LoadError => err
-	task :no_test do
-		$stderr.puts "Test tasks not defined: %s" % [ err.message ]
 	end
 
-	task :unittests => :no_rspec
-end
-
-
-### RCov (via RSpec) tasks
-begin
-	gem 'rcov'
-	gem 'rspec', '>= 1.1.3'
-
-	require 'spec'
-	require 'rcov'
-
 	### Task: coverage (via RCov)
 	desc "Build test coverage reports"
-	unless SPEC_FILES.empty?
-		Spec::Rake::SpecTask.new( :coverage ) do |task|
-			task.spec_files = SPEC_FILES
-			task.libs += [LIBDIR]
-			task.spec_opts = ['-f', 'p', '-b']
-			task.rcov_opts = RCOV_OPTS
-			task.rcov = true
-		end
+	RSpec::Core::RakeTask.new( :coverage ) do |task|
+		task.ruby_opts = [ "-I#{LIBDIR}" ]
+		task.rspec_opts = ['-f', 'p', '-b']
+		task.rcov_opts = RCOV_OPTS
+		task.rcov = true
 	end
 
-
 	### Task: rcov
 	task :rcov => :coverage
 
 	### Other coverage tasks
 	namespace :coverage do
 		desc "Generate a detailed text coverage report"
-		Spec::Rake::SpecTask.new( :text ) do |task|
-			task.spec_files = SPEC_FILES
+		RSpec::Core::RakeTask.new( :text ) do |task|
 			task.rcov_opts = RCOV_OPTS + ['--text-report']
 			task.rcov = true
 		end
 
 		desc "Show differences in coverage from last run"
-		Spec::Rake::SpecTask.new( :diff ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = ['-f', 'p', '-b']
+		RSpec::Core::RakeTask.new( :diff ) do |task|
+			task.rspec_opts = ['-f', 'p', '-b']
 			task.rcov_opts = RCOV_OPTS - ['--save'] + ['--text-coverage-diff']
 			task.rcov = true
 		end
 
 		desc "Run RCov in 'spec-only' mode to check coverage from specs"
-		Spec::Rake::SpecTask.new( :speconly ) do |task|
-			task.spec_files = SPEC_FILES
+		RSpec::Core::RakeTask.new( :speconly ) do |task|
 			task.rcov_opts = ['--exclude', RCOV_EXCLUDES, '--text-report', '--save']
 			task.rcov = true
 		end
 	end
 
 	CLOBBER.include( COVERAGE_TARGETDIR )
-
 rescue LoadError => err
-	task :no_rcov do
-		$stderr.puts "Coverage tasks not defined: RSpec+RCov tasklib not available: %s" %
-		[ err.message ]
+	task :no_rspec do
+		$stderr.puts "Specification tasks not defined: %s" % [ err.message ]
 	end
 
-	task :coverage => :no_rcov
-	task :clobber_coverage
-	task :rcov => :no_rcov
-	namespace :coverage do
-		task :text => :no_rcov
-		task :diff => :no_rcov
+	task :spec => :no_rspec
+	namespace :spec do
+		task :autotest => :no_rspec
+		task :doc => :no_rspec
+		task :profile => :no_rspec
+		task :quiet => :no_rspec
+		task :html => :no_rspec
 	end
-	task :verify => :no_rcov
+end
+
+
+### Test::Unit tests
+begin
+	require 'rake/testtask'
+
+	Rake::TestTask.new( :unittests ) do |task|
+		task.libs += [LIBDIR]
+		task.test_files = TEST_FILES
+		task.verbose = true
+	end
+
+rescue LoadError => err
+	task :no_test do
+		$stderr.puts "Test tasks not defined: %s" % [ err.message ]
+	end
+
+	task :unittests => :no_rspec
 end
 
 

data/spec/lib/helpers.rb

@@ -1,9 +1,19 @@
 #!/usr/bin/env ruby
 
 require 'pathname'
+require 'rspec'
+
+
+RSpec.configure do |config|
+	ruby_version_vec = RUBY_VERSION.split('.').map {|c| c.to_i }.pack( "N*" )
+
+	config.mock_with :rspec
+	config.filter_run_excluding :ruby_19 => true if ruby_version_vec <= [1,9,1].pack( "N*" )
+end
 
 module PgTestingHelpers
 
+
 	# Set some ANSI escape code constants (Shamelessly stolen from Perl's
 	# Term::ANSIColor by Russ Allbery <rra@stanford.edu> and Zenin <zenin@best.com>
 	ANSI_ATTRIBUTES = {
@@ -104,6 +114,8 @@ module PgTestingHelpers
 	end
 
 
+	NOFORK_PLATFORMS = %w{java}
+
 	### Run the specified command +cmd+ after redirecting stdout and stderr to the specified 
 	### +logpath+, failing if the execution fails.
 	def log_and_run( logpath, *cmd )
@@ -115,16 +127,24 @@ module PgTestingHelpers
 			trace( cmd )
 		end
 
-		logfh = File.open( logpath, File::WRONLY|File::CREAT|File::APPEND )
-		if pid = fork
-			logfh.close
-			Process.wait
+		# Eliminate the noise of creating/tearing down the database by
+		# redirecting STDERR/STDOUT to a logfile if the Ruby interpreter
+		# supports fork()
+		if NOFORK_PLATFORMS.include?( RUBY_PLATFORM )
+			system( *cmd )
 		else
-			$stdout.reopen( logfh )
-			$stderr.reopen( $stdout )
-			exec( *cmd )
-			$stderr.puts "After the exec()?!??!"
-			exit!
+			logfh = File.open( logpath, File::WRONLY|File::CREAT|File::APPEND )
+			if pid = fork
+				logfh.close
+			else
+				$stdout.reopen( logfh )
+				$stderr.reopen( $stdout )
+				exec( *cmd )
+				$stderr.puts "After the exec()?!??!"
+				exit!
+			end
+
+			Process.wait( pid )
 		end
 
 		raise "Command failed: [%s]" % [cmd.join(' ')] unless $?.success?
@@ -141,15 +161,18 @@ module PgTestingHelpers
 			datadir = testdir + 'data'
 			pidfile = datadir + 'postmaster.pid'
 			if pidfile.exist? && pid = pidfile.read.chomp.to_i
+				$stderr.puts "pidfile (%p) exists: %d" % [ pidfile, pid ]
 				begin
 					Process.kill( 0, pid )
 				rescue Errno::ESRCH
-					trace "No postmaster running for %s" % [ datadir ]
+					$stderr.puts "No postmaster running for %s" % [ datadir ]
 					# Process isn't alive, so don't try to stop it
 				else
-					trace "Stopping lingering database at PID %d"
+					$stderr.puts "Stopping lingering database at PID %d" % [ pid ]
 					run 'pg_ctl', '-D', datadir.to_s, '-m', 'fast', 'stop'
 				end
+			else
+				$stderr.puts "No pidfile (%p)" % [ pidfile ]
 			end
 		end
 	end
@@ -176,20 +199,19 @@ module PgTestingHelpers
 		begin
 			unless (@test_pgdata+"postgresql.conf").exist?
 				FileUtils.rm_rf( @test_pgdata, :verbose => $DEBUG )
-				trace "Running initdb"
+				$stderr.puts "Running initdb"
 				log_and_run @logfile, 'initdb', '--no-locale', '-D', @test_pgdata.to_s
 			end
 
 			trace "Starting postgres"
 			log_and_run @logfile, 'pg_ctl', '-w', '-o', "-k #{@test_directory.to_s.inspect}",
 				'-D', @test_pgdata.to_s, 'start'
+			sleep 2
+
+			$stderr.puts "Creating the test DB"
+			log_and_run @logfile, 'psql', '-e', '-c', 'DROP DATABASE IF EXISTS test', 'postgres'
+			log_and_run @logfile, 'createdb', '-e', 'test'
 
-			if `psql -l` =~ /^\s*test\s/
-				trace "Dropping the test DB"
-				log_and_run @logfile, 'dropdb', 'test'
-			end
-			trace "Creating the test DB"
-			log_and_run @logfile, 'createdb', 'test'
 		rescue => err
 			$stderr.puts "%p during test setup: %s" % [ err.class, err.message ]
 			$stderr.puts "See #{@logfile} for details."

data/spec/m17n_spec.rb

@@ -9,33 +9,21 @@ BEGIN {
 	libdir = basedir + 'lib'
 	archlib = libdir + Config::CONFIG['sitearch']
 
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( archlib.to_s ) unless $LOAD_PATH.include?( archlib.to_s )
 }
 
-require 'pg'
-
-require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'spec/lib/helpers'
+require 'pg'
 
-describe "multinationalization support" do
+describe "multinationalization support", :ruby_19 => true do
 	include PgTestingHelpers
 
-	RUBY_VERSION_VEC = RUBY_VERSION.split('.').map {|c| c.to_i }.pack("N*")
-	MIN_RUBY_VERSION_VEC = [1,9,1].pack('N*')
-
-
 	before( :all ) do
-		@conn = nil
-		if RUBY_VERSION_VEC >= MIN_RUBY_VERSION_VEC
-			@conn = setup_testing_db( "m17n" )
-			@conn.exec( 'BEGIN' )
-		end
-	end
-
-	before( :each ) do
-		pending "depends on m17n support in Ruby >= 1.9.1" if @conn.nil?
+		@conn = setup_testing_db( "m17n" )
+		@conn.exec( 'BEGIN' )
 	end
 
 
@@ -49,7 +37,7 @@ describe "multinationalization support" do
 			res = conn.exec("VALUES ('#{PGconn.escape_bytea(in_bytes)}'::bytea)", [], 0)
 			out_bytes = PGconn.unescape_bytea(res[0]['column1'])
 		end
-		out_bytes.should== in_bytes
+		out_bytes.should == in_bytes
 	end
 
 	describe "rubyforge #22925: m17n support" do
@@ -114,17 +102,41 @@ describe "multinationalization support" do
 					res = conn.exec( stmt, [], 0 )
 					out_string = res[0]['column1']
 				end
-				out_string.should == 'foo'.encode(Encoding::ASCII_8BIT)
+				out_string.should == 'foo'.encode( Encoding::ASCII_8BIT )
 				out_string.encoding.should == Encoding::ASCII_8BIT
 			end
 		end
 
-		it "should use client encoding for escaped string" do
-			original = "string to escape".force_encoding("euc-jp")
-			@conn.set_client_encoding("euc_jp")
-			escaped  = @conn.escape(original)
+		it "uses the client encoding for escaped string" do
+			original = "string to escape".force_encoding( "euc-jp" )
+			@conn.set_client_encoding( "euc_jp" )
+			escaped  = @conn.escape( original )
 			escaped.encoding.should == Encoding::EUC_JP
 		end
+	end
+
+	describe "Ruby 1.9.x default_internal encoding" do
+
+		it "honors the Encoding.default_internal if it's set and the synchronous interface is used" do
+			@conn.transaction do |txn_conn|
+				txn_conn.internal_encoding = Encoding::ISO8859_1
+				txn_conn.exec( "CREATE TABLE defaultinternaltest ( foo text )" )
+				txn_conn.exec( "INSERT INTO defaultinternaltest VALUES ('Grün und Weiß')" )
+			end
+
+			begin
+				prev_encoding = Encoding.default_internal
+				Encoding.default_internal = Encoding::UTF_8
+
+				conn = PGconn.connect( @conninfo )
+				conn.internal_encoding.should == Encoding::UTF_8
+				res = conn.exec( "SELECT foo FROM defaultinternaltest" )
+				res[0]['foo'].encoding.should == Encoding::UTF_8
+			ensure
+				conn.finish if conn
+				Encoding.default_internal = prev_encoding
+			end
+		end
 
 	end
 

data/spec/pgconn_spec.rb

@@ -9,15 +9,14 @@ BEGIN {
 	libdir = basedir + 'lib'
 	archlib = libdir + Config::CONFIG['sitearch']
 
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( archlib.to_s ) unless $LOAD_PATH.include?( archlib.to_s )
 }
 
-require 'pg'
-
-require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'spec/lib/helpers'
+require 'pg'
 require 'timeout'
 
 describe PGconn do
@@ -82,27 +81,69 @@ describe PGconn do
 		res[0]['n'].should == '1'
 	end
 
+
+	EXPECTED_TRACE_OUTPUT = %{
+		To backend> Msg Q
+		To backend> "SELECT 1 AS one"
+		To backend> Msg complete, length 21
+		From backend> T
+		From backend (#4)> 28
+		From backend (#2)> 1
+		From backend> "one"
+		From backend (#4)> 0
+		From backend (#2)> 0
+		From backend (#4)> 23
+		From backend (#2)> 4
+		From backend (#4)> -1
+		From backend (#2)> 0
+		From backend> D
+		From backend (#4)> 11
+		From backend (#2)> 1
+		From backend (#4)> 1
+		From backend (1)> 1
+		From backend> C
+		From backend (#4)> 13
+		From backend> "SELECT 1"
+		From backend> Z
+		From backend (#4)> 5
+		From backend> Z
+		From backend (#4)> 5
+		From backend> T
+		}.gsub( /^\t{2}/, '' ).lstrip
+
 	unless RUBY_PLATFORM =~ /mswin|mingw/
 		it "should trace and untrace client-server communication" 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')
-			@conn.trace(trace_file)
-			trace_file.close
+			trace_file = @test_directory + "test_trace.out"
+			trace_io = trace_file.open( 'w', 0600 )
+			@conn.trace( trace_io )
+			trace_io.close
+
 			res = @conn.exec("SELECT 1 AS one")
 			@conn.untrace
+
 			res = @conn.exec("SELECT 2 AS two")
-			trace_file = open(File.join(@test_directory, "test_trace.out"), 'rb')
+
 			trace_data = trace_file.read
-			trace_file.close
-			trace_data.should == expected_trace_data
+
+			expected_trace_output = EXPECTED_TRACE_OUTPUT.dup
+			# For PostgreSQL < 9.0, the output will be different:
+			# -From backend (#4)> 13
+			# -From backend> "SELECT 1"
+			# +From backend (#4)> 11
+			# +From backend> "SELECT"
+			if @conn.server_version < 90000
+				expected_trace_output.sub!( /From backend \(#4\)> 13/, 'From backend (#4)> 11' )
+				expected_trace_output.sub!( /From backend> "SELECT 1"/, 'From backend> "SELECT"' )
+			end
+
+			trace_data.should == expected_trace_output
 		end
 	end
 
-	it "should cancel a query" do
+	it "allows a query to be cancelled" do
 		error = false
 		@conn.send_query("SELECT pg_sleep(1000)")
 		@conn.cancel
@@ -113,6 +154,25 @@ describe PGconn do
 		error.should == true
 	end
 
+	it "automatically rolls back a transaction started with PGconn#transaction if an exception " +
+	   "is raised" do
+		# abort the per-example transaction so we can test our own
+		@conn.exec( 'ROLLBACK' )
+
+		res = nil
+		@conn.exec( "CREATE TABLE pie ( flavor TEXT )" )
+
+		expect {
+			res = @conn.transaction do
+				@conn.exec( "INSERT INTO pie VALUES ('rhubarb'), ('cherry'), ('schizophrenia')" )
+				raise "Oh noes! All pie is gone!"
+			end
+		}.to raise_exception( RuntimeError, /all pie is gone/i )
+
+		res = @conn.exec( "SELECT * FROM pie" )
+		res.ntuples.should == 0
+	end
+
 	it "should not read past the end of a large object" do
 		@conn.transaction do
 			oid = @conn.lo_create( 0 )
@@ -125,16 +185,19 @@ describe PGconn do
 	end
 
 
-	it "should wait for NOTIFY events via select()" do
+	it "can wait for NOTIFY events" do
 		@conn.exec( 'ROLLBACK' )
 		@conn.exec( 'LISTEN woo' )
 
 		pid = fork do
-			conn = PGconn.connect( @conninfo )
-			sleep 1
-			conn.exec( 'NOTIFY woo' )
-			conn.finish
-			exit!
+			begin
+				conn = PGconn.connect( @conninfo )
+				sleep 1
+				conn.exec( 'NOTIFY woo' )
+			ensure
+				conn.finish
+				exit!
+			end
 		end
 
 		@conn.wait_for_notify( 10 ).should == 'woo'
@@ -143,6 +206,199 @@ describe PGconn do
 		Process.wait( pid )
 	end
 
+	it "calls a block for NOTIFY events if one is given" do
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN woo' )
+
+		pid = fork do
+			begin
+				conn = PGconn.connect( @conninfo )
+				sleep 1
+				conn.exec( 'NOTIFY woo' )
+			ensure
+				conn.finish
+				exit!
+			end
+		end
+
+		eventpid = event = nil
+		@conn.wait_for_notify( 10 ) {|*args| event, eventpid = args }
+		event.should == 'woo'
+		eventpid.should be_an( Integer )
+
+		@conn.exec( 'UNLISTEN woo' )
+
+		Process.wait( pid )
+	end
+
+	it "doesn't collapse sequential notifications" do
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN woo' )
+		@conn.exec( 'LISTEN war' )
+		@conn.exec( 'LISTEN woz' )
+
+		pid = fork do
+			begin
+				conn = PGconn.connect( @conninfo )
+				conn.exec( 'NOTIFY woo' )
+				conn.exec( 'NOTIFY war' )
+				conn.exec( 'NOTIFY woz' )
+			ensure
+				conn.finish
+				exit!
+			end
+		end
+
+		Process.wait( pid )
+
+		channels = []
+		3.times do
+			channels << @conn.wait_for_notify( 2 )
+		end
+
+		channels.should have( 3 ).members
+		channels.should include( 'woo', 'war', 'woz' )
+
+		@conn.exec( 'UNLISTEN woz' )
+		@conn.exec( 'UNLISTEN war' )
+		@conn.exec( 'UNLISTEN woo' )
+	end
+
+	it "returns notifications which are already in the queue before wait_for_notify is called " +
+	   "without waiting for the socket to become readable" do
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN woo' )
+
+		pid = fork do
+			begin
+				conn = PGconn.connect( @conninfo )
+				conn.exec( 'NOTIFY woo' )
+			ensure
+				conn.finish
+				exit!
+			end
+		end
+
+		# Wait for the forked child to send the notification
+		Process.wait( pid )
+
+		# Cause the notification to buffer, but not be read yet
+		@conn.exec( 'SELECT 1' )
+
+		@conn.wait_for_notify( 10 ).should == 'woo'
+		@conn.exec( 'UNLISTEN woo' )
+	end
+
+	context "under PostgreSQL 9" do
+
+		before( :each ) do
+			pending "only works under PostgreSQL 9" if @conn.server_version < 9_00_00
+		end
+
+		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
+		    "any number of arguments" do
+
+			@conn.exec( 'ROLLBACK' )
+			@conn.exec( 'LISTEN knees' )
+
+			pid = fork do
+				conn = PGconn.connect( @conninfo )
+				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+				conn.finish
+				exit!
+			end
+
+			Process.wait( pid )
+
+			event, pid, msg = nil
+			@conn.wait_for_notify( 10 ) do |*args|
+				event, pid, msg = *args
+			end
+			@conn.exec( 'UNLISTEN woo' )
+
+			event.should == 'knees'
+			pid.should be_a_kind_of( Integer )
+			msg.should == 'skirt and boots'
+		end
+
+		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
+		   "two arguments" do
+
+			@conn.exec( 'ROLLBACK' )
+			@conn.exec( 'LISTEN knees' )
+
+			pid = fork do
+				conn = PGconn.connect( @conninfo )
+				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+				conn.finish
+				exit!
+			end
+
+			Process.wait( pid )
+
+			event, pid, msg = nil
+			@conn.wait_for_notify( 10 ) do |arg1, arg2|
+				event, pid, msg = arg1, arg2
+			end
+			@conn.exec( 'UNLISTEN woo' )
+
+			event.should == 'knees'
+			pid.should be_a_kind_of( Integer )
+			msg.should be_nil()
+		end
+
+		it "calls the block supplied to wait_for_notify with the notify payload if it " +
+		   "doesn't accept arguments" do
+
+			@conn.exec( 'ROLLBACK' )
+			@conn.exec( 'LISTEN knees' )
+
+			pid = fork do
+				conn = PGconn.connect( @conninfo )
+				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+				conn.finish
+				exit!
+			end
+
+			Process.wait( pid )
+
+			notification_received = false
+			@conn.wait_for_notify( 10 ) do
+				notification_received = true
+			end
+			@conn.exec( 'UNLISTEN woo' )
+
+			notification_received.should be_true()
+		end
+
+		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
+		   "three arguments" do
+
+			@conn.exec( 'ROLLBACK' )
+			@conn.exec( 'LISTEN knees' )
+
+			pid = fork do
+				conn = PGconn.connect( @conninfo )
+				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+				conn.finish
+				exit!
+			end
+
+			Process.wait( pid )
+
+			event, pid, msg = nil
+			@conn.wait_for_notify( 10 ) do |arg1, arg2, arg3|
+				event, pid, msg = arg1, arg2, arg3
+			end
+			@conn.exec( 'UNLISTEN woo' )
+
+			event.should == 'knees'
+			pid.should be_a_kind_of( Integer )
+			msg.should == 'skirt and boots'
+		end
+
+	end
+
 	it "yields the result if block is given to exec" do
 		rval = @conn.exec( "select 1234::int as a union select 5678::int as a" ) do |result|
 			values = []
@@ -197,7 +453,7 @@ describe PGconn do
 		@conn.block( 0.1 )
 		finish = Time.now
 
-		(finish - start).should be_close( 0.1, 0.05 )
+		(finish - start).should be_within( 0.05 ).of( 0.1 )
 	end