Skip to content

Commit b73ad37

Browse files
author
Henning Block
committed
fix tests
1 parent 76dd716 commit b73ad37

File tree

7 files changed

+191
-137
lines changed

7 files changed

+191
-137
lines changed

spec/classes/mongos_config_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
{
99
:osfamily => 'Debian',
1010
:operatingsystem => 'Debian',
11-
:root_home => '/root'
11+
:root_home => '/root',
12+
:operatingsystemmajrelease => '14.04'
1213
}
1314
end
1415

spec/classes/mongos_install_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
{
99
:osfamily => 'Debian',
1010
:operatingsystem => 'Debian',
11-
:root_home => '/root'
11+
:root_home => '/root',
12+
:operatingsystemmajrelease => '14.04'
1213
}
1314
end
1415

spec/classes/mongos_service_spec.rb

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55
context 'on Debian with service_manage set to true' do
66
let :facts do
77
{
8-
:osfamily => 'Debian',
9-
:operatingsystem => 'Debian',
10-
:operatingsystemrelease => '7.0',
11-
:root_home=> '/root'
8+
:osfamily => 'Debian',
9+
:operatingsystem => 'Debian',
10+
:operatingsystemrelease => '7.0',
11+
:root_home => '/root',
12+
:operatingsystemmajrelease => '14.04'
1213
}
1314
end
1415

15-
let :pre_condition do
16+
let :pre_condition do
1617
"class { 'mongodb::mongos':
1718
configdb => ['127.0.0.1:27019'],
1819
}"
19-
end
20+
end
2021

2122
describe 'include init script' do
2223
it { is_expected.to contain_file('/etc/init.d/mongos') }
@@ -31,9 +32,11 @@
3132
context 'on Debian with service_manage set to false' do
3233
let :facts do
3334
{
34-
:osfamily => 'Debian',
35-
:operatingsystem => 'Debian',
36-
:operatingsystemrelease => '7.0',
35+
:osfamily => 'Debian',
36+
:operatingsystem => 'Debian',
37+
:operatingsystemrelease => '7.0',
38+
:operatingsystemmajrelease => '14.04',
39+
:root_home => '/root'
3740
}
3841
end
3942

@@ -53,9 +56,11 @@
5356
context 'on RedHat with service_manage set to true' do
5457
let :facts do
5558
{
56-
:osfamily => 'RedHat',
57-
:operatingsystem => 'RedHat',
58-
:operatingsystemrelease => '7.0',
59+
:osfamily => 'RedHat',
60+
:operatingsystem => 'RedHat',
61+
:operatingsystemrelease => '7.0',
62+
:operatingsystemmajrelease => '14.04',
63+
:root_home => '/root'
5964
}
6065
end
6166

@@ -82,9 +87,11 @@
8287
context 'on RedHat with service_manage set to false' do
8388
let :facts do
8489
{
85-
:osfamily => 'RedHat',
86-
:operatingsystem => 'RedHat',
87-
:operatingsystemrelease => '7.0',
90+
:osfamily => 'RedHat',
91+
:operatingsystem => 'RedHat',
92+
:operatingsystemrelease => '7.0',
93+
:operatingsystemmajrelease => '14.04',
94+
:root_home => '/root'
8895
}
8996
end
9097

spec/classes/mongos_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
describe 'mongodb::mongos' do
44
let :facts do
55
{
6-
:osfamily => 'Debian',
7-
:operatingsystem => 'Debian',
8-
:root_home=> '/root'
6+
:osfamily => 'Debian',
7+
:operatingsystem => 'Debian',
8+
:root_home => '/root',
9+
:operatingsystemmajrelease => '14.04',
910
}
1011
end
1112

1213
let :params do
1314
{
14-
:configdb => ['127.0.0.1:27019']
15+
:configdb => ['127.0.0.1:27019']
1516
}
1617
end
1718

@@ -22,8 +23,7 @@
2223
end
2324

2425
context 'when deploying on Solaris' do
25-
let :facts do
26-
{ :osfamily => 'Solaris' }
26+
let :facts do {:osfamily => 'Solaris', }
2727
end
2828
it { expect { is_expected.to raise_error(Puppet::Error) } }
2929
end

spec/classes/repo_spec.rb

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
context 'when deploying on Debian' do
66
let :facts do
77
{
8-
:osfamily => 'Debian',
9-
:operatingsystem => 'Debian',
10-
:operatingsystemrelease => '7.0',
11-
:lsbdistid => 'Debian',
12-
:root_home=> '/root'
8+
:osfamily => 'Debian',
9+
:operatingsystem => 'Debian',
10+
:operatingsystemrelease => '7.0',
11+
:lsbdistid => 'Debian',
12+
:root_home => '/root',
13+
:operatingsystemmajrelease => '7.0'
1314
}
1415
end
1516

@@ -21,9 +22,10 @@
2122
context 'when deploying on CentOS' do
2223
let :facts do
2324
{
24-
:osfamily => 'RedHat',
25-
:operatingsystem => 'CentOS',
26-
:operatingsystemrelease => '7.0',
25+
:osfamily => 'RedHat',
26+
:operatingsystem => 'CentOS',
27+
:operatingsystemrelease => '7.0',
28+
:operatingsystemmajrelease => '7.0'
2729
}
2830
end
2931

@@ -35,28 +37,29 @@
3537
context 'when yumrepo has a proxy set' do
3638
let :facts do
3739
{
38-
:osfamily => 'RedHat',
39-
:operatingsystem => 'RedHat',
40-
:operatingsystemrelease => '7.0',
40+
:osfamily => 'RedHat',
41+
:operatingsystem => 'RedHat',
42+
:operatingsystemrelease => '7.0',
43+
:operatingsystemmajrelease => '7.0'
4144
}
4245
end
4346
let :params do
4447
{
45-
:proxy => 'http://proxy-server:8080',
46-
:proxy_username => 'proxyuser1',
47-
:proxy_password => 'proxypassword1',
48+
:proxy => 'http://proxy-server:8080',
49+
:proxy_username => 'proxyuser1',
50+
:proxy_password => 'proxypassword1',
4851
}
4952
end
5053
it {
5154
is_expected.to contain_class('mongodb::repo::yum')
5255
}
5356
it do
5457
should contain_yumrepo('mongodb').with({
55-
'enabled' => '1',
56-
'proxy' => 'http://proxy-server:8080',
57-
'proxy_username' => 'proxyuser1',
58-
'proxy_password' => 'proxypassword1',
59-
})
58+
'enabled' => '1',
59+
'proxy' => 'http://proxy-server:8080',
60+
'proxy_username' => 'proxyuser1',
61+
'proxy_password' => 'proxypassword1',
62+
})
6063
end
6164
end
6265
end

0 commit comments

Comments
 (0)