Skip to content

Commit 09c63fb

Browse files
committed
Merge pull request #502 from igalic/osrelease
fix spec tests, by adding osrelease facts
2 parents 6736fb8 + 50612ab commit 09c63fb

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

spec/classes/mysql_bindings_spec.rb

+9-7
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
'ruby_enable' => true,
1010
}}
1111

12-
shared_examples 'bindings' do |osfamily, operatingsystem, java_name, perl_name, php_name, python_name, ruby_name|
12+
shared_examples 'bindings' do |osfamily, operatingsystem, operatingsystemrelease, java_name, perl_name, php_name, python_name, ruby_name|
1313
let :facts do
14-
{ :osfamily => osfamily, :operatingsystem => operatingsystem, :root_home => '/root'}
14+
{ :osfamily => osfamily, :operatingsystem => operatingsystem,
15+
:operatingsystemrelease => operatingsystemrelease, :root_home => '/root',
16+
}
1517
end
1618
it { should contain_package('mysql-connector-java').with(
1719
:name => java_name,
@@ -32,17 +34,17 @@
3234
end
3335

3436
context 'Debian' do
35-
it_behaves_like 'bindings', 'Debian', 'Debian', 'libmysql-java', 'libdbd-mysql-perl', 'php5-mysql', 'python-mysqldb', 'libmysql-ruby'
36-
it_behaves_like 'bindings', 'Debian', 'Ubuntu', 'libmysql-java', 'libdbd-mysql-perl', 'php5-mysql', 'python-mysqldb', 'libmysql-ruby'
37+
it_behaves_like 'bindings', 'Debian', 'Debian', '7.4','libmysql-java', 'libdbd-mysql-perl', 'php5-mysql', 'python-mysqldb', 'libmysql-ruby'
38+
it_behaves_like 'bindings', 'Debian', 'Ubuntu', '14.04', 'libmysql-java', 'libdbd-mysql-perl', 'php5-mysql', 'python-mysqldb', 'libmysql-ruby'
3739
end
3840

3941
context 'freebsd' do
40-
it_behaves_like 'bindings', 'FreeBSD', 'FreeBSD', 'databases/mysql-connector-java', 'p5-DBD-mysql', 'databases/php5-mysql', 'databases/py-MySQLdb', 'databases/ruby-mysql'
42+
it_behaves_like 'bindings', 'FreeBSD', 'FreeBSD', '10.0', 'databases/mysql-connector-java', 'p5-DBD-mysql', 'databases/php5-mysql', 'databases/py-MySQLdb', 'databases/ruby-mysql'
4143
end
4244

4345
context 'redhat' do
44-
it_behaves_like 'bindings', 'RedHat', 'RedHat', 'mysql-connector-java', 'perl-DBD-MySQL', 'php-mysql', 'MySQL-python', 'ruby-mysql'
45-
it_behaves_like 'bindings', 'RedHat', 'OpenSuSE', 'mysql-connector-java', 'perl-DBD-MySQL', 'php-mysql', 'MySQL-python', 'ruby-mysql'
46+
it_behaves_like 'bindings', 'RedHat', 'RedHat', '6.5', 'mysql-connector-java', 'perl-DBD-MySQL', 'php-mysql', 'MySQL-python', 'ruby-mysql'
47+
it_behaves_like 'bindings', 'RedHat', 'OpenSuSE', '11.3', 'mysql-connector-java', 'perl-DBD-MySQL', 'php-mysql', 'MySQL-python', 'ruby-mysql'
4648
end
4749

4850
describe 'on any other os' do

0 commit comments

Comments
 (0)