summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklós Fazekas <mfazekas@szemafor.com>2021-08-05 12:25:20 +0200
committerMiklós Fazekas <mfazekas@szemafor.com>2021-08-05 12:25:20 +0200
commit5bb3618cbfb56521d51c4bc6cec104d6ccd12bfc (patch)
tree8878b43b1708d32f636c01b51ef945e4e2b808cb
parentafd91b19bf2bc5a04b5b6267e1d3bcfef08f4025 (diff)
downloadnet-ssh-5bb3618cbfb56521d51c4bc6cec104d6ccd12bfc.tar.gz
Fix start_sshd_7_or_later config lines
-rw-r--r--test/integration/common.rb2
-rw-r--r--test/integration/test_channel.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/common.rb b/test/integration/common.rb
index 791106d..0f79c68 100644
--- a/test/integration/common.rb
+++ b/test/integration/common.rb
@@ -122,7 +122,7 @@ module IntegrationTestHelpers
yield pid, port
end
else
- with_lines_as_tempfile('') do |path, pidpath|
+ with_lines_as_tempfile(['']) do |path, pidpath|
pid = spawn('sudo', '/opt/net-ssh-openssh/sbin/sshd', '-D', '-f', path, '-p', port)
sshpidfile = pidpath
yield pid, port
diff --git a/test/integration/test_channel.rb b/test/integration/test_channel.rb
index 46f5fd5..4d55b75 100644
--- a/test/integration/test_channel.rb
+++ b/test/integration/test_channel.rb
@@ -108,7 +108,7 @@ class TestChannel < NetSSHTest
def test_channel_should_set_environment_variables_on_remote
setup_ssh_env do
- start_sshd_7_or_later(config: 'AcceptEnv foo baz') do |_pid, port|
+ start_sshd_7_or_later(config: ['AcceptEnv foo baz']) do |_pid, port|
Timeout.timeout(20) do
# We have our own sshd, give it a chance to come up before
# listening.