Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spec helper: Add archlinux platform #1879

Merged
merged 3 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2024-05-10 15:53:37 UTC using RuboCop version 1.62.1.
# on 2024-05-11 14:14:06 UTC using RuboCop version 1.62.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -244,11 +244,10 @@ RSpec/ReceiveMessages:
- 'spec/beaker/test_suite_spec.rb'
- 'spec/helpers.rb'

# Offense count: 7
# Offense count: 4
RSpec/RepeatedDescription:
Exclude:
- 'spec/beaker/cli_spec.rb'
- 'spec/beaker/host/unix/exec_spec.rb'
- 'spec/beaker/host/unix/pkg_spec.rb'

# Offense count: 4
Expand Down
10 changes: 2 additions & 8 deletions lib/beaker/host/unix/exec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -278,20 +278,14 @@ def clear_env_var key
# @return [Result] result of restarting the SSH service
def ssh_service_restart
case self['platform']
when /debian|ubuntu/
exec(Beaker::Command.new("service ssh restart"))
when /amazon|(el|centos|redhat|oracle|scientific)-[7-9]|fedora|archlinux-/
exec(Beaker::Command.new("systemctl restart sshd.service"))
when /el-|centos|redhat|oracle|scientific/
when /(el|centos|redhat|oracle|scientific)-[0-6]/
exec(Beaker::Command.new("/sbin/service sshd restart"))
when /opensuse|sles/
exec(Beaker::Command.new("/usr/sbin/rcsshd restart"))
when /solaris/
exec(Beaker::Command.new("svcadm restart svc:/network/ssh:default"))
when /(free|open)bsd/
exec(Beaker::Command.new("sudo /etc/rc.d/sshd restart"))
else
raise ArgumentError, "Unsupported Platform: '#{self['platform']}'"
exec(Beaker::Command.new("systemctl restart sshd.service"))
end
end

Expand Down
29 changes: 1 addition & 28 deletions spec/beaker/host/unix/exec_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@ def to_s
let(:ssh_command) { "echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit" }
let(:ssh_move) { "mv #{directory}/sshd_config.permit /etc/ssh/sshd_config" }

platforms = PlatformHelpers::SYSTEMDPLATFORMS + PlatformHelpers::DEBIANPLATFORMS + PlatformHelpers::SYSTEMVPLATFORMS

platforms.each do |platform|
PlatformHelpers::SYSTEMDPLATFORMS.each do |platform|
it "calls the correct commands for #{platform}" do
opts['platform'] = platform
expect(instance).to receive(:exec).twice
Expand Down Expand Up @@ -114,31 +112,6 @@ def to_s
expect { instance.ssh_service_restart }.not_to raise_error
end
end

PlatformHelpers::DEBIANPLATFORMS.each do |platform|
it "calls the correct command for #{platform}" do
opts['platform'] = platform
expect(instance).to receive(:exec)
expect(Beaker::Command).to receive(:new).with("service ssh restart")
expect { instance.ssh_service_restart }.not_to raise_error
end
end

PlatformHelpers::SYSTEMVPLATFORMS.each do |platform|
it "calls the correct command for #{platform}" do
opts['platform'] = "#{platform}-arch"
expect(instance).to receive(:exec)
expect(Beaker::Command).to receive(:new).with("/sbin/service sshd restart")
expect { instance.ssh_service_restart }.not_to raise_error
end
end

it 'raises an error on unsupported platforms' do
opts['platform'] = 'notarealthing02-parts-arch'
expect do
instance.ssh_service_restart
end.to raise_error(ArgumentError, /#{opts['platform']}/)
end
end

describe '#prepend_commands' do
Expand Down
21 changes: 6 additions & 15 deletions spec/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,10 @@ module PlatformHelpers

SYSTEMDPLATFORMS = %w[amazon-2023
fedora
el-7
centos-7
redhat-7
oracle-7
scientific-7
el-8
centos-8
redhat-8
oracle-8]

SYSTEMVPLATFORMS = ['el-',
'centos',
'redhat',
'oracle',
'scientific',]
el-
centos
redhat
oracle
scientific
archlinux].concat(DEBIANPLATFORMS)
end