change tests to use SLES platform instead of openSUSE

Change-Id: I0631e9c26f02164fa15cf52198055643eb540132
This commit is contained in:
Ionuț Arțăriși 2014-02-07 10:53:35 +01:00
parent 2b42e6cffe
commit 2cb0c061d6
5 changed files with 16 additions and 16 deletions

View File

@ -6,9 +6,9 @@ require_relative 'spec_helper'
describe 'openstack-block-storage::api' do
before { block_storage_stubs }
describe 'opensuse' do
describe 'suse' do
before do
@chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
@chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
@chef_run.converge 'openstack-block-storage::api'
end
@ -21,7 +21,7 @@ describe 'openstack-block-storage::api' do
end
it 'installs postgresql python packages if explicitly told' do
chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
node = chef_run.node
node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
chef_run.converge 'openstack-block-storage::api'

View File

@ -7,7 +7,7 @@ require_relative 'spec_helper'
describe 'openstack-block-storage::cinder-common' do
before { block_storage_stubs }
before do
@chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS do |n|
@chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS do |n|
n.set['openstack']['mq'] = {
'host' => '127.0.0.1'
}

View File

@ -6,9 +6,9 @@ require_relative 'spec_helper'
describe 'openstack-block-storage::scheduler' do
before { block_storage_stubs }
describe 'opensuse' do
describe 'suse' do
before do
@chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
@chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
@chef_run.converge 'openstack-block-storage::scheduler'
end
@ -17,7 +17,7 @@ describe 'openstack-block-storage::scheduler' do
end
it 'does not upgrade stevedore' do
chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
chef_run.converge 'openstack-block-storage::scheduler'
expect(chef_run).not_to upgrade_python_pip 'stevedore'
@ -28,7 +28,7 @@ describe 'openstack-block-storage::scheduler' do
end
it 'installs postgresql python packages if explicitly told' do
chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
node = chef_run.node
node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
chef_run.converge 'openstack-block-storage::scheduler'

View File

@ -8,9 +8,9 @@ require 'chef/application'
require_relative 'support/matcher'
::LOG_LEVEL = :fatal
::OPENSUSE_OPTS = {
platform: 'opensuse',
version: '12.3',
::SUSE_OPTS = {
platform: 'suse',
version: '11.03',
log_level: ::LOG_LEVEL
}
::REDHAT_OPTS = {

View File

@ -6,9 +6,9 @@ require_relative 'spec_helper'
describe 'openstack-block-storage::volume' do
before { block_storage_stubs }
describe 'opensuse' do
describe 'suse' do
before do
@chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
@chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
@chef_run.converge 'openstack-block-storage::volume'
end
@ -21,7 +21,7 @@ describe 'openstack-block-storage::volume' do
end
it 'installs postgresql python packages if explicitly told' do
chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS
chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS
node = chef_run.node
node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
chef_run.converge 'openstack-block-storage::volume'
@ -48,7 +48,7 @@ describe 'openstack-block-storage::volume' do
end
it 'installs nfs packages' do
chef_run = ::ChefSpec::Runner.new ::OPENSUSE_OPTS do |n|
chef_run = ::ChefSpec::Runner.new ::SUSE_OPTS do |n|
n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.netapp.nfs.NetAppDirect7modeNfsDriver'
end
chef_run.converge 'openstack-block-storage::volume'
@ -57,7 +57,7 @@ describe 'openstack-block-storage::volume' do
expect(chef_run).not_to upgrade_package 'nfs-utils-lib'
end
it 'has opensuse include' do
it 'has suse include' do
file = '/etc/tgt/targets.conf'
expect(@chef_run).to render_file(file).with_content('include /var/lib/cinder/volumes/*')