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: Ie0a11d0fded4602cf94b127f6829eab43848a32d
changes/52/267752/1
Denis Egorenko 7 years ago
parent 32afcf4af8
commit 950a90ab7a
  1. 3
      Gemfile
  2. 44
      spec/defaults.rb
  3. 2
      spec/spec_helper.rb

@ -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,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…
Cancel
Save