From ee7e537e4952151e19f4fbdd924a71eabc940647 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 21 Nov 2016 14:57:03 -0800 Subject: remove sysbench, add 'amazon' family Signed-off-by: Lamont Granquist --- kitchen-tests/cookbooks/base/recipes/packages.rb | 2 +- kitchen-tests/test/integration/webapp/default_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kitchen-tests') diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/base/recipes/packages.rb index 92390f0942..c4457e5945 100644 --- a/kitchen-tests/cookbooks/base/recipes/packages.rb +++ b/kitchen-tests/cookbooks/base/recipes/packages.rb @@ -1,7 +1,7 @@ # this is just a list of package that exist on every O/S we test, and often aren't installed by default. you don't # have to get too clever here, you can delete packages if they don't exist everywhere we test. -pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux sysbench } +pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux } # this deliberately calls the multipackage API N times in order to do one package installation in order to exercise the # multipackage cookbook. diff --git a/kitchen-tests/test/integration/webapp/default_spec.rb b/kitchen-tests/test/integration/webapp/default_spec.rb index 1e5004cd3e..cf148218b7 100644 --- a/kitchen-tests/test/integration/webapp/default_spec.rb +++ b/kitchen-tests/test/integration/webapp/default_spec.rb @@ -12,7 +12,7 @@ when "debian", "ubuntu" ssh_package = "openssh-client" ssh_service = "ssh" ntp_service = "ntp" -when "centos", "redhat", "fedora" +when "centos", "redhat", "fedora", "amazon" ssh_package = "openssh-clients" ssh_service = "sshd" ntp_service = "ntpd" @@ -91,7 +91,7 @@ describe package("autoconf") do it { should be_installed } end -%w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux sysbench }.each do |pkg| +%w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux }.each do |pkg| describe package pkg do it { should be_installed } end -- cgit v1.2.1