summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklós Fazekas <mfazekas@szemafor.com>2021-08-03 21:34:27 +0200
committerGitHub <noreply@github.com>2021-08-03 21:34:27 +0200
commit95e38e747fe2e210c9dbbd016d468477d1c2ecd1 (patch)
treeb85da2a81fbf09969e9adde420fd95467a61691a
parentad2c8fa65a83f0d799df706fa30ed4a987e3de0b (diff)
parent53e38ba90f48d2e289df784c0eaab10c5e6fae5c (diff)
downloadnet-ssh-95e38e747fe2e210c9dbbd016d468477d1c2ecd1.tar.gz
Merge pull request #829 from net-ssh/mfazekas/fix-int-test
Fix integration tests
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.noed255191
-rw-r--r--test/integration/common.rb2
3 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 2bfe7d2..267d8eb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,4 +8,5 @@ gem 'byebug', group: %i[development test] if !Gem.win_platform? && RUBY_ENGINE =
if ENV["CI"]
gem 'codecov', require: false, group: :test
gem 'simplecov', require: false, group: :test
+ gem 'webrick' if RUBY_VERSION.split(".")[0].to_i >= 3
end
diff --git a/Gemfile.noed25519 b/Gemfile.noed25519
index b6c3576..4adaf04 100644
--- a/Gemfile.noed25519
+++ b/Gemfile.noed25519
@@ -7,4 +7,5 @@ gemspec
if ENV["CI"] && !Gem.win_platform?
gem 'simplecov', require: false, group: :test
gem 'codecov', require: false, group: :test
+ gem 'webrick' if RUBY_VERSION.split(".")[0].to_i >= 3
end
diff --git a/test/integration/common.rb b/test/integration/common.rb
index ada7cad..129e5a4 100644
--- a/test/integration/common.rb
+++ b/test/integration/common.rb
@@ -101,7 +101,7 @@ module IntegrationTestHelpers
end
end
- def port_open?(path)
+ def is_port_open?(path)
Socket.tcp("localhost", 10567, connect_timeout: 1) { true } rescue false # rubocop:disable Style/RescueModifier
end