Skip to content

Commit 69ce234

Browse files
committed
(MODULES-5208) Fix spec tests for Puppet 5
As part of PUP-5659 relationship validation in the catalog now errors instead of warning for missing required relationships. Previously the spec tests were passing as Puppet 4.x would ignore the required resource e.g. the sqlserver::login::permissions resource required a sql::config resource in the catalog. However our test fixtures were not creating that but Puppet didn't care. Now that Puppet des validate these relationships, the specs were failing. This commit adds the required resources into the test fixtures.
1 parent 9cde0b6 commit 69ce234

File tree

6 files changed

+29
-3
lines changed

6 files changed

+29
-3
lines changed

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)