summaryrefslogtreecommitdiff
path: root/spec/unit/provider
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-11-14 16:26:48 -0800
committerGitHub <noreply@github.com>2018-11-14 16:26:48 -0800
commitfd3963d04c51a85c43461759019c50972e7c2e02 (patch)
tree8286c11a55954de6c5e09270a730574cbbea69f3 /spec/unit/provider
parentc7cdc49cabcdafb59c5f9518e93d0f2f9595c3be (diff)
parent4feb2c43302425ce74f5310739ce57af4f5639ae (diff)
downloadchef-fd3963d04c51a85c43461759019c50972e7c2e02.tar.gz
Merge pull request #7914 from EugenMayer/patch-1
use --no-tty during apt-keys fro gpg - fixes #7913
Diffstat (limited to 'spec/unit/provider')
-rw-r--r--spec/unit/provider/apt_repository_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/unit/provider/apt_repository_spec.rb b/spec/unit/provider/apt_repository_spec.rb
index 1601e9f629..11d505dad8 100644
--- a/spec/unit/provider/apt_repository_spec.rb
+++ b/spec/unit/provider/apt_repository_spec.rb
@@ -162,16 +162,16 @@ C5986B4F1257FFA86632CBA746181433FBB75451
describe "#keyserver_install_cmd" do
it "returns keyserver install command" do
- expect(provider.keyserver_install_cmd("ABC", "gpg.mit.edu")).to eq("apt-key adv --recv --keyserver hkp://gpg.mit.edu:80 ABC")
+ expect(provider.keyserver_install_cmd("ABC", "gpg.mit.edu")).to eq("apt-key adv --no-tty --recv --keyserver hkp://gpg.mit.edu:80 ABC")
end
it "uses proxy if key_proxy property is set" do
new_resource.key_proxy("proxy.mycorp.dmz:3128")
- expect(provider.keyserver_install_cmd("ABC", "gpg.mit.edu")).to eq("apt-key adv --recv --keyserver-options http-proxy=proxy.mycorp.dmz:3128 --keyserver hkp://gpg.mit.edu:80 ABC")
+ expect(provider.keyserver_install_cmd("ABC", "gpg.mit.edu")).to eq("apt-key adv --no-tty --recv --keyserver-options http-proxy=proxy.mycorp.dmz:3128 --keyserver hkp://gpg.mit.edu:80 ABC")
end
it "properly handles keyservers passed with hkp:// URIs" do
- expect(provider.keyserver_install_cmd("ABC", "hkp://gpg.mit.edu")).to eq("apt-key adv --recv --keyserver hkp://gpg.mit.edu ABC")
+ expect(provider.keyserver_install_cmd("ABC", "hkp://gpg.mit.edu")).to eq("apt-key adv --no-tty --recv --keyserver hkp://gpg.mit.edu ABC")
end
end