1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00

fix assert_parsing_logs_uri

This commit is contained in:
Vyacheslav Alexeev 2020-06-30 22:08:16 +03:00
parent 766eb050c0
commit eff4691b28

View file

@ -347,17 +347,21 @@ class TestBinder < TestBinderBase
prepared_paths = {
ssl: "ssl://127.0.0.1:#{UniquePort.call}?#{ssl_query}",
tcp: "http://127.0.0.1:#{UniquePort.call}",
tcp: "tcp://127.0.0.1:#{UniquePort.call}",
unix: "unix://test/#{name}_server.sock"
}
expected_logs = prepared_paths.dup.tap do |logs|
logs[:tcp] = logs[:tcp].gsub('tcp://', 'http://')
end
tested_paths = [prepared_paths[order[0]], prepared_paths[order[1]]]
@binder.parse tested_paths, @events
stdout = @events.stdout.string
order.each do |prot|
assert_match prepared_paths[prot], stdout
assert_match expected_logs[prot], stdout
end
ensure
@binder.close_listeners if order.include?(:unix) && UNIX_SKT_EXIST