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: I570e671118817d4a623fbcedf9f1989757f4590a
This commit is contained in:
parent
7b7b31d09d
commit
a82fa4bb64
3
Gemfile
3
Gemfile
@ -15,6 +15,9 @@ group :development, :test do
|
||||
gem 'puppet-lint-numericvariable', :require => 'false'
|
||||
gem 'json', :require => 'false'
|
||||
gem 'webmock', :require => 'false'
|
||||
gem 'puppet-openstack_spec_helper',
|
||||
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
|
||||
:require => false
|
||||
end
|
||||
|
||||
group :system_tests do
|
||||
|
@ -1,40 +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" => [
|
||||
"6.0",
|
||||
"7.0"
|
||||
]
|
||||
},
|
||||
{
|
||||
"operatingsystem" => "RedHat",
|
||||
"operatingsystemrelease" => [
|
||||
"6.0",
|
||||
"7.0"
|
||||
]
|
||||
},
|
||||
{
|
||||
"operatingsystem" => "Ubuntu",
|
||||
"operatingsystemrelease" => [
|
||||
"12.04",
|
||||
"14.04"
|
||||
]
|
||||
},
|
||||
{
|
||||
"operatingsystem" => "Debian",
|
||||
"operatingsystemrelease" => [
|
||||
"7",
|
||||
"8"
|
||||
]
|
||||
}
|
||||
]
|
||||
end
|
||||
end
|
@ -2,9 +2,9 @@ require 'puppetlabs_spec_helper/module_spec_helper'
|
||||
require 'shared_examples'
|
||||
require 'webmock/rspec'
|
||||
|
||||
require 'puppet-openstack_spec_helper/defaults'
|
||||
require 'rspec-puppet-facts'
|
||||
include RspecPuppetFacts
|
||||
require 'defaults.rb'
|
||||
|
||||
RSpec.configure do |c|
|
||||
c.alias_it_should_behave_like_to :it_configures, 'configures'
|
||||
|
Loading…
Reference in New Issue
Block a user