From eff4691b287240aeb4b8fed13d9453e24c58e979 Mon Sep 17 00:00:00 2001 From: Vyacheslav Alexeev Date: Tue, 30 Jun 2020 22:08:16 +0300 Subject: [PATCH] fix assert_parsing_logs_uri --- test/test_binder.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/test_binder.rb b/test/test_binder.rb index a2c20898..2ca8f9e8 100644 --- a/test/test_binder.rb +++ b/test/test_binder.rb @@ -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