From a82fa4bb644f375a502199dc9ab8d7ba845ebd4e Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Thu, 14 Jan 2016 21:09:43 +0300 Subject: [PATCH] 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 --- Gemfile | 3 +++ spec/defaults.rb | 40 ---------------------------------------- spec/spec_helper.rb | 2 +- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 spec/defaults.rb diff --git a/Gemfile b/Gemfile index 6d35d93..5ad0760 100644 --- a/Gemfile +++ b/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 diff --git a/spec/defaults.rb b/spec/defaults.rb deleted file mode 100644 index 3bd0d95..0000000 --- a/spec/defaults.rb +++ /dev/null @@ -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 => '' }.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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a2ccc7b..bd97904 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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'