From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 22 Jan 2016 14:31:14 +0000 (-0500)
Subject: drop mock dependency
X-Git-Tag: 7.1.0~5
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4446631c8928c4eb7d29e90e3ecbba119a6f1ec4;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
(cherry picked from commit aeb040c9354dd60c93ef3b3ebfd0ec31c20cae85)
---

diff --git a/Gemfile b/Gemfile
index fc22143..9843921 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,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'
 end
 
 group :system_tests do
diff --git a/spec/classes/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb
index b3bbfff..c3e54c8 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 3df4ced..172614e 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'
 
 RSpec.configure do |c|
   c.alias_it_should_behave_like_to :it_configures, 'configures'