Skip to content

Commit b52e819

Browse files
evgeniehelms
authored andcommitted
correctly clean up mosquitto inbetween tests
otherwise `remote_execution_script_pull_mqtt_spec.rb` leaves `mosquitto` installed and `remote_execution_script_spec.rb` will encounter a system where `/etc/mosquitto` exists
1 parent ecaa99c commit b52e819

File tree

11 files changed

+15
-14
lines changed

11 files changed

+15
-14
lines changed

spec/acceptance/ansible_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper_acceptance'
22

33
describe 'Scenario: install foreman-proxy with ansible plugin' do
4-
before(:context) { purge_installed_packages }
4+
before(:context) { purge_foreman_proxy }
55

66
include_examples 'the example', 'ansible.pp'
77

spec/acceptance/basic_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper_acceptance'
22

33
describe 'Scenario: install foreman-proxy' do
4-
before(:context) { purge_installed_packages }
4+
before(:context) { purge_foreman_proxy }
55

66
include_examples 'the example', 'basic.pp'
77

spec/acceptance/dns_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# On EL bind runs using PIDFile in systemd which is broken under docker
44
broken_pid_file = ENV['BEAKER_HYPERVISOR'] == 'docker' && host_inventory['facter']['os']['family'] == 'RedHat'
55
describe 'Scenario: install foreman-proxy', unless: broken_pid_file do
6-
before(:context) { purge_installed_packages }
6+
before(:context) { purge_foreman_proxy }
77

88
include_examples 'the example', 'dns.pp'
99

spec/acceptance/dual_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper_acceptance'
22

33
describe 'Scenario: install foreman-proxy with http and https enabled' do
4-
before(:context) { purge_installed_packages }
4+
before(:context) { purge_foreman_proxy }
55

66
include_examples 'the example', 'dual.pp'
77

spec/acceptance/dynflow_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper_acceptance'
22

33
describe 'Scenario: install foreman-proxy', unless: ENV['BEAKER_HYPERVISOR'] == 'docker' do
4-
before(:context) { purge_installed_packages }
4+
before(:context) { purge_foreman_proxy }
55

66
include_examples 'the example', 'dynflow.pp'
77

spec/acceptance/http_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper_acceptance'
22

33
describe 'Scenario: install foreman-proxy with http enabled' do
4-
before(:context) { purge_installed_packages }
4+
before(:context) { purge_foreman_proxy }
55

66
it_behaves_like 'the example', 'http.pp'
77

spec/acceptance/journald_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper_acceptance'
22

33
describe 'Scenario: install foreman-proxy with journald' do
4-
before(:context) { purge_installed_packages }
4+
before(:context) { purge_foreman_proxy }
55

66
include_examples 'the example', 'journald.pp'
77

spec/acceptance/netboot_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper_acceptance'
22

33
describe 'Scenario: tftp' do
4-
before(:context) { purge_installed_packages }
4+
before(:context) { purge_foreman_proxy }
55

66
include_examples 'the example', 'tftp.pp'
77

spec/acceptance/remote_execution_script_pull_mqtt_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper_acceptance'
22

33
describe 'Scenario: install foreman-proxy with remote_execution script plugin with pull-mqtt' do
4-
before(:context) { purge_installed_packages }
4+
before(:context) { purge_foreman_proxy }
55

66
context 'with default params' do
77
include_examples 'the example', 'remote_execution_script_pull_mqtt.pp'

spec/acceptance/remote_execution_script_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper_acceptance'
22

33
describe 'Scenario: install foreman-proxy with remote_execution script plugin' do
4-
before(:context) { purge_installed_packages }
4+
before(:context) { purge_foreman_proxy }
55

66
include_examples 'the example', 'remote_execution_script.pp'
77

@@ -13,7 +13,7 @@
1313
end
1414

1515
describe 'Scenario: install foreman-proxy with remote_execution script plugin and ssh_log_level param' do
16-
before(:context) { purge_installed_packages }
16+
before(:context) { purge_foreman_proxy }
1717

1818
include_examples 'the example', 'remote_execution_script-ssh_log_level.pp'
1919

0 commit comments

Comments
 (0)