Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 842add1

Browse files
authored
Merge pull request #229 from puppetlabs/msync_modules5187
(MODULES-5187)(MODULES-52080) mysnc puppet 5 and ruby 2.4
2 parents b045d07 + 69ce234 commit 842add1

File tree

9 files changed

+52
-12
lines changed

9 files changed

+52
-12
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ before_install:
1010
matrix:
1111
fast_finish: true
1212
include:
13-
- rvm: 2.3.1
13+
- rvm: 2.4.0
1414
bundler_args: --without system_tests
15-
env: PUPPET_GEM_VERSION="~> 4.0"
16-
- rvm: 2.1.7
15+
env: PUPPET_GEM_VERSION="~> 5.0"
16+
- rvm: 2.1.9
1717
bundler_args: --without system_tests
1818
env: PUPPET_GEM_VERSION="~> 4.0"
1919
notifications:

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ group :system_tests do
6060
gem "beaker-pe", :require => false
6161
gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
6262
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
63-
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
63+
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
6464
gem "beaker-testmode_switcher", '<= 0.2.0', :require => false
65-
gem 'master_manipulator', :require => false
65+
gem "master_manipulator", :require => false
6666
end
6767

6868
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

‎appveyor.yml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,28 @@ environment:
1414
RUBY_VER: 21
1515
- PUPPET_GEM_VERSION: ~> 4.0
1616
RUBY_VER: 21-x64
17-
- PUPPET_GEM_VERSION: ~> 4.0
18-
RUBY_VER: 23
19-
- PUPPET_GEM_VERSION: ~> 4.0
20-
RUBY_VER: 23-x64
17+
- PUPPET_GEM_VERSION: ~> 5.0
18+
RUBY_VER: 24
19+
- PUPPET_GEM_VERSION: ~> 5.0
20+
RUBY_VER: 24-x64
21+
- PUPPET_GEM_VERSION: 4.7.1
22+
RUBY_VER: 21-x64
2123
matrix:
2224
fast_finish: true
2325
install:
2426
- SET PATH=C:\Ruby%RUBY_VER%\bin;%PATH%
27+
- ps: |
28+
# AppVeyor appears to have OpenSSL headers available already
29+
# which msys2 would normally install with:
30+
# pacman -S mingw-w64-x86_64-openssl --noconfirm
31+
#
32+
if ( $(ruby --version) -match "^ruby\s+2\.4" ) {
33+
Write-Output "Building OpenSSL gem ~> 2.0.4 to fix Ruby 2.4 / AppVeyor issue"
34+
gem install openssl --version '~> 2.0.4' --no-ri --no-rdoc
35+
}
36+
37+
gem list openssl
38+
ruby -ropenssl -e 'puts \"OpenSSL Version - #{OpenSSL::OPENSSL_VERSION}\"; puts \"OpenSSL Library Version - #{OpenSSL::OPENSSL_LIBRARY_VERSION}\"'
2539
- bundle install --jobs 4 --retry 2 --without system_tests
2640
- type Gemfile.lock
2741
build: off

‎spec/defines/database_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
:db_name => 'myTestDb',
1010
:instance => 'MSSQLSERVER',
1111
} }
12-
end
13-
14-
describe 'Minimal Params' do
1512
let(:pre_condition) { <<-EOF
1613
define sqlserver::config{}
1714
sqlserver::config {'MSSQLSERVER': }
1815
EOF
1916
}
17+
end
18+
19+
describe 'Minimal Params' do
2020
it_behaves_like 'compile'
2121
end
2222

‎spec/defines/login/permissions_spec.rb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33

44
describe 'sqlserver::login::permissions' do
55
let(:facts) { {:osfamily => 'windows'} }
6+
let(:pre_condition) { <<-EOF
7+
define sqlserver::config{}
8+
sqlserver::config {'MSSQLSERVER': }
9+
EOF
10+
}
611
context 'validation errors' do
712
include_context 'manifests' do
813
let(:title) { 'myTitle' }

‎spec/defines/login_spec.rb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
:login => 'myTitle',
1010
:instance => 'MSSQLSERVER',
1111
} }
12+
let(:pre_condition) { <<-EOF
13+
define sqlserver::config{}
14+
sqlserver::config {'MSSQLSERVER': }
15+
EOF
16+
}
1217
end
1318

1419
describe 'Minimal Params' do

‎spec/defines/sp_configure_spec.rb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
:config_name => 'filestream access level',
1010
:value => 1,
1111
} }
12+
let(:pre_condition) { <<-EOF
13+
define sqlserver::config{}
14+
sqlserver::config {'MSSQLSERVER': }
15+
EOF
16+
}
1217
end
1318
describe 'basic usage' do
1419
let(:should_contain_command) { [

‎spec/defines/user/permissions_spec.rb‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
describe 'sqlserver::user::permissions' do
55
let(:facts) { {:osfamily => 'windows'} }
6+
let(:pre_condition) { <<-EOF
7+
define sqlserver::config{}
8+
sqlserver::config {'MSSQLSERVER': }
9+
EOF
10+
}
11+
612
context 'validation errors' do
713
include_context 'manifests' do
814
let(:title) { 'myTitle' }

‎spec/defines/user_spec.rb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
let(:title) { 'loggingUser' }
77
let(:sqlserver_tsql_title) { 'user-MSSQLSERVER-myDatabase-loggingUser' }
88
let(:params) { {:user => 'loggingUser', :database => 'myDatabase'} }
9+
let(:pre_condition) { <<-EOF
10+
define sqlserver::config{}
11+
sqlserver::config {'MSSQLSERVER': }
12+
EOF
13+
}
914
end
1015

1116
describe 'should fail when password above 128 characters' do

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /