Skip to content

Commit

Permalink
Merge pull request voxpupuli#222 from voxpupuli/modulesync
Browse files Browse the repository at this point in the history
modulesync 0.21.3
  • Loading branch information
dhollinger authored Jun 13, 2017
2 parents 17edc91 + bca2004 commit 440625e
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.21.1'
modulesync_config_version: '0.21.3'
1 change: 1 addition & 0 deletions .rspec_parallel
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--format progress
4 changes: 4 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,10 @@ Style/ClosingParenthesisIndentation:

# RSpec

RSpec/BeforeAfterAll:
Exclude:
- spec/acceptance/**/*

# We don't use rspec in this way
RSpec/DescribeClass:
Enabled: False
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ group :test do
gem 'github_changelog_generator', '~> 1.13.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'github_changelog_generator', :require => false if RUBY_VERSION >= '2.2.2'
gem 'parallel_tests', :require => false
end

group :development do
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.6.1 < 5.0.0"
"version_requirement": ">= 4.7.0 < 5.0.0"
}
]
}
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/archlinux-2-x64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
archlinux-2-x64:
roles:
- master
platform: archlinux-2-x64
box: archlinux/archlinux
hypervisor: vagrant
CONFIG:
type: foss
10 changes: 5 additions & 5 deletions spec/acceptance/selinux_permissive_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
apply_manifest(manifest, catch_failures: true)
end

after :all do # rubocop:disable RSpec/BeforeAfterAll
after :all do
# cleanup
shell('semanage permissive -d passwd_t', acceptable_exit_codes: [0, 1])
end
Expand All @@ -19,7 +19,7 @@
end
end
context 'purge with ensure present for passwd_t, when kernel_t is permissive' do
before :all do # rubocop:disable RSpec/BeforeAfterAll
before :all do
shell('semanage permissive -a kernel_t')
end
let(:result) do
Expand All @@ -30,7 +30,7 @@
apply_manifest(manifest, catch_failures: true)
end

after :all do # rubocop:disable RSpec/BeforeAfterAll
after :all do
# clean up
shell('semanage permissive -d passwd_t', acceptable_exit_codes: [0, 1])
shell('semanage permissive -d kernel_t', acceptable_exit_codes: [0, 1])
Expand All @@ -46,7 +46,7 @@
end
end
context 'ensure absent for kernel_t only, when passwd_t is also permissive' do
before :all do # rubocop:disable RSpec/BeforeAfterAll
before :all do
shell('semanage permissive -a kernel_t')
shell('semanage permissive -a passwd_t')
end
Expand All @@ -55,7 +55,7 @@
apply_manifest(manifest, catch_failures: true)
end

after :all do # rubocop:disable RSpec/BeforeAfterAll
after :all do
# clean up
shell('semanage permissive -d passwd_t', acceptable_exit_codes: [0, 1])
shell('semanage permissive -d kernel_t', acceptable_exit_codes: [0, 1])
Expand Down

0 comments on commit 440625e

Please sign in to comment.