Merge "Use openstack spec helper for spec defaults"
This commit is contained in:
commit
265fa4925e
3
Gemfile
3
Gemfile
|
@ -16,6 +16,9 @@ group :development, :test do
|
|||
gem 'json', :require => 'false'
|
||||
gem 'webmock', :require => 'false'
|
||||
gem 'netaddr', :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,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
|
|
@ -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