kill HTTPS server after usage, don't pollute STDOUT

This commit is contained in:
Niklas Baumstark 2011-09-29 02:40:13 +02:00 committed by Matthew Mongeau
parent a08e5e8794
commit d348e203a8
2 changed files with 6 additions and 4 deletions

View File

@ -46,7 +46,7 @@ describe Capybara::Driver::Webkit::Browser do
# set up SSL layer
serv = OpenSSL::SSL::SSLServer.new(serv, $openssl_self_signed_ctx)
server_thread = Thread.new(serv) do |serv|
@server_thread = Thread.new(serv) do |serv|
while conn = serv.accept do
# read request
request = []
@ -66,7 +66,11 @@ describe Capybara::Driver::Webkit::Browser do
end
end
it "doesn't accepts a self-signed certificate by default" do
after do
@server_thread.kill
end
it "doesn't accept a self-signed certificate by default" do
lambda { browser.visit "https://#{@host}:#{@port}/" }.should raise_error
end

View File

@ -25,8 +25,6 @@ int main(int argc, char **argv) {
if (server.start()) {
std::cout << "Capybara-webkit server started, listening on port: " << server.server_port() << std::endl;
if (ignoreSslErrors)
std::cout << "Ignoring SSL errors" << std::endl;
return app.exec();
} else {
std::cerr << "Couldn't start capybara-webkit server" << std::endl;