From a7f568f55581c7a906481605565af8c7ff427320 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 22 Jan 2016 09:27:24 -0500 Subject: [PATCH] drop mock dependency mock is not used anywhere in the module, let's drop it. This patch will help to hit this bug: https://launchpad.net/bugs/1492636 Change-Id: Ia4f85ce2088759ec6e07bda994f0c011a0886b36 --- Gemfile | 1 - spec/classes/aodh_evaluator_spec.rb | 2 -- spec/classes/aodh_listener_spec.rb | 2 -- spec/classes/aodh_notifier_spec.rb | 2 -- spec/spec_helper.rb | 1 - 5 files changed, 8 deletions(-) diff --git a/Gemfile b/Gemfile index 5ad0760c..efeba2a4 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,6 @@ group :development, :test do gem 'puppet-lint-variable_contains_upcase', :require => 'false' 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 diff --git a/spec/classes/aodh_evaluator_spec.rb b/spec/classes/aodh_evaluator_spec.rb index 471db05d..343fe0f5 100644 --- a/spec/classes/aodh_evaluator_spec.rb +++ b/spec/classes/aodh_evaluator_spec.rb @@ -1,6 +1,4 @@ require 'spec_helper' -# LP1492636 - Cohabitation of compile matcher and webmock -WebMock.disable_net_connect!(:allow => "169.254.169.254") describe 'aodh::evaluator' do diff --git a/spec/classes/aodh_listener_spec.rb b/spec/classes/aodh_listener_spec.rb index f54d1e43..da83ed98 100644 --- a/spec/classes/aodh_listener_spec.rb +++ b/spec/classes/aodh_listener_spec.rb @@ -1,6 +1,4 @@ require 'spec_helper' -# LP1492636 - Cohabitation of compile matcher and webmock -WebMock.disable_net_connect!(:allow => "169.254.169.254") describe 'aodh::listener' do diff --git a/spec/classes/aodh_notifier_spec.rb b/spec/classes/aodh_notifier_spec.rb index 3bb88074..14409a3b 100644 --- a/spec/classes/aodh_notifier_spec.rb +++ b/spec/classes/aodh_notifier_spec.rb @@ -1,6 +1,4 @@ require 'spec_helper' -# LP1492636 - Cohabitation of compile matcher and webmock -WebMock.disable_net_connect!(:allow => "169.254.169.254") describe 'aodh::notifier' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 313923de..c3bab73f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,5 @@ require 'puppetlabs_spec_helper/module_spec_helper' require 'shared_examples' -require 'webmock/rspec' require 'rspec-puppet-facts' require 'puppet-openstack_spec_helper/defaults'