From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 22 Jan 2016 14:31:14 +0000 (-0500)
Subject: drop mock dependency
X-Git-Tag: 8.0.0b1~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=aeb040c9354dd60c93ef3b3ebfd0ec31c20cae85;p=puppet-modules%2Fpuppet-ceilometer.git

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: I000953c7b215454baf9838813c04e94b7ebeca00
---

diff --git a/Gemfile b/Gemfile
index 5ad0760..efeba2a 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/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb
index b1752f7..a7b8fe6 100644
--- a/spec/classes/ceilometer_collector_spec.rb
+++ b/spec/classes/ceilometer_collector_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 'ceilometer::collector' do
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bd97904..be3811c 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 'puppet-openstack_spec_helper/defaults'
 require 'rspec-puppet-facts'