bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a test broken by stdout/stderr reshuffle

Browse Source
This commit is contained in:
Alex Young
2012-07-11 10:12:10 +01:00
parent f3f017a87d
commit 84dd052465
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/acceptance/test_source_error_handling.rb
View File

@@ -27,30 +27,30 @@ class TestSourceErrorHandling < Test::Unit::TestCase
def test_destination_hangs_after_connect_reports_error_at_source def test_destination_hangs_after_connect_reports_error_at_source
run_fake( "dest/hang_after_connect", run_fake( "dest/hang_after_connect",
/Remote server failed to respond/ ) :err => /Remote server failed to respond/ )
end end
def test_destination_rejects_connection_reports_error_at_source def test_destination_rejects_connection_reports_error_at_source
run_fake( "dest/reject_acl", run_fake( "dest/reject_acl",
/Mirror was rejected/ ) :err => /Mirror was rejected/ )
end end
def test_wrong_size_causes_disconnect def test_wrong_size_causes_disconnect
run_fake( "dest/hello_wrong_size", run_fake( "dest/hello_wrong_size",
/Remote size does not match local size/ ) :err => /Remote size does not match local size/ )
end end
def test_wrong_magic_causes_disconnect def test_wrong_magic_causes_disconnect
run_fake( "dest/hello_wrong_magic", run_fake( "dest/hello_wrong_magic",
/Mirror was rejected/ ) :err => /Mirror was rejected/ )
end end
def test_disconnect_after_hello_causes_retry def test_disconnect_after_hello_causes_retry
run_fake( "dest/close_after_hello", run_fake( "dest/close_after_hello",
/Mirror started/ ) :out => /Mirror started/ )
end end
@@ -86,11 +86,12 @@ class TestSourceErrorHandling < Test::Unit::TestCase
private private
def run_fake(name, err=nil) def run_fake(name, opts = {})
@env.run_fake( name, @env.ip, @env.port2 ) @env.run_fake( name, @env.ip, @env.port2 )
stdout, stderr = @env.mirror12_unchecked stdout, stderr = @env.mirror12_unchecked
assert_success assert_success
assert_match( err, stderr ) if err assert_match( opts[:err], stderr ) if opts[:err]
assert_match( opts[:out], stdout ) if opts[:out]
return stdout, stderr return stdout, stderr
end end