Use openstack spec helper for spec defaults
* Add puppet-openstack_spec_helper to Gemfile * Use puppet-openstack_spec_helper/defaults in spec_helper * Delete spec/defaults.rb, useless now Change-Id: Iba85d84a1dfec3721a3e5c76d4633aad2806af18
This commit is contained in:
parent
fc8fc7fd26
commit
277cf7ae23
3
Gemfile
3
Gemfile
|
@ -15,6 +15,9 @@ group :development, :test do
|
||||||
gem 'puppet-lint-numericvariable', :require => 'false'
|
gem 'puppet-lint-numericvariable', :require => 'false'
|
||||||
gem 'json', :require => 'false'
|
gem 'json', :require => 'false'
|
||||||
gem 'webmock', :require => 'false'
|
gem 'webmock', :require => 'false'
|
||||||
|
gem 'puppet-openstack_spec_helper',
|
||||||
|
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
|
||||||
|
:require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
group :system_tests do
|
group :system_tests do
|
||||||
|
|
|
@ -1,44 +0,0 @@
|
||||||
# This file contains a module to return a default set of facts and supported
|
|
||||||
# operating systems for the tests in this module.
|
|
||||||
module OSDefaults
|
|
||||||
def self.get_facts(extra_facts={})
|
|
||||||
{ :os_service_default => '<SERVICE DEFAULT>' }.merge(extra_facts)
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.get_supported_os
|
|
||||||
[
|
|
||||||
{
|
|
||||||
"operatingsystem" => "CentOS",
|
|
||||||
"operatingsystemrelease" => [
|
|
||||||
"7.0"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"operatingsystem" => "RedHat",
|
|
||||||
"operatingsystemrelease" => [
|
|
||||||
"7.0"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"operatingsystem" => "Fedora",
|
|
||||||
"operatingsystemrelease" => [
|
|
||||||
"21",
|
|
||||||
"22"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"operatingsystem" => "Ubuntu",
|
|
||||||
"operatingsystemrelease" => [
|
|
||||||
"14.04"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"operatingsystem" => "Debian",
|
|
||||||
"operatingsystemrelease" => [
|
|
||||||
"7",
|
|
||||||
"8"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -3,8 +3,8 @@ require 'shared_examples'
|
||||||
require 'webmock/rspec'
|
require 'webmock/rspec'
|
||||||
|
|
||||||
require 'rspec-puppet-facts'
|
require 'rspec-puppet-facts'
|
||||||
|
require 'puppet-openstack_spec_helper/defaults'
|
||||||
include RspecPuppetFacts
|
include RspecPuppetFacts
|
||||||
require 'defaults.rb'
|
|
||||||
|
|
||||||
RSpec.configure do |c|
|
RSpec.configure do |c|
|
||||||
c.alias_it_should_behave_like_to :it_configures, 'configures'
|
c.alias_it_should_behave_like_to :it_configures, 'configures'
|
||||||
|
|
Loading…
Reference in New Issue