Skip to content

Commit 1ac24b6

Browse files
authored
Merge pull request #962 from puppetlabs/msync_modules5187
(MODULES-5187) mysnc puppet 5 and ruby 2.4
2 parents 08005a4 + e6230e7 commit 1ac24b6

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ matrix:
2222
script: bundle exec rake beaker
2323
services: docker
2424
sudo: required
25-
- rvm: 2.3.1
25+
- rvm: 2.4.0
2626
bundler_args: --without system_tests
27-
env: PUPPET_GEM_VERSION="~> 4.0"
28-
- rvm: 2.1.7
27+
env: PUPPET_GEM_VERSION="~> 5.0"
28+
- rvm: 2.1.9
2929
bundler_args: --without system_tests
3030
env: PUPPET_GEM_VERSION="~> 4.0"
3131
notifications:

spec/classes/mysql_server_account_security_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
describe 'mysql::server::account_security' do
44
on_supported_os.each do |os, facts|
55
context "on #{os}" do
6+
let(:pre_condition) { <<-EOF
7+
anchor {'mysql::server::end': }
8+
EOF
9+
}
610
context "with fqdn==myhost.mydomain" do
711
let(:facts) {
812
facts.merge({

spec/classes/mysql_server_backup_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
describe 'mysql::server::backup' do
44
on_supported_os.each do |os, facts|
55
context "on #{os}" do
6+
let(:pre_condition) { <<-EOF
7+
class { 'mysql::server': }
8+
EOF
9+
}
610
let(:facts) {
711
facts.merge({
812
:root_home => '/root',

0 commit comments

Comments
 (0)