Merge "change tests to use SLES11SP3 instead of openSUSE 12.3"

This commit is contained in:
Jenkins 2014-02-12 18:10:39 +00:00 committed by Gerrit Code Review
commit a3591c1e5b
6 changed files with 13 additions and 13 deletions

View File

@ -3,9 +3,9 @@ require_relative 'spec_helper'
describe 'openstack-metering::agent-central' do
before { metering_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-metering::agent-central'
end

View File

@ -3,9 +3,9 @@ require_relative 'spec_helper'
describe 'openstack-metering::agent-compute' do
before { metering_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-metering::agent-compute'
end

View File

@ -3,9 +3,9 @@ require_relative 'spec_helper'
describe 'openstack-metering::api' do
before { metering_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-metering::api'
end

View File

@ -3,9 +3,9 @@ require_relative 'spec_helper'
describe 'openstack-metering::collector' do
before { metering_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-metering::collector'
end

View File

@ -3,9 +3,9 @@ require_relative 'spec_helper'
describe 'openstack-metering::common' do
before { metering_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-metering::common'
end

View File

@ -4,9 +4,9 @@ require 'chefspec/berkshelf'
require 'chef/application'
::LOG_LEVEL = :fatal
::OPENSUSE_OPTS = {
platform: 'opensuse',
version: '12.3',
::SUSE_OPTS = {
platform: 'suse',
version: '11.03',
log_level: ::LOG_LEVEL
}
::REDHAT_OPTS = {