From b8804eb5f18917584ff4c0b4ab0b6ceff34ded4b Mon Sep 17 00:00:00 2001
From: Dakota Schneider <dakota@hackthetruth.org>
Date: Mon, 2 Jul 2018 08:57:30 -0700
Subject: [PATCH] (MAINT) Drop MockVsphereHelper (#10)

* (MAINT) Update specs to remove VsphereHelper

VsphereHelper is no longer relevant since vmpooler doesn't use vSphere/vCloud any more.

* (MAINT) Drop conflicting, unused dependency on beaker-abs

* (MAINT) Conditionally pin fakefs '< 0.14.0' for Ruby < '2.3.0'

* (MAINT) Remove more VsphereHelper references

And minor whitespace cleanup

* (MAINT) Drop unused beaker-abs dependency

Could have sworn I fixed that... maybe in a different branch?
---
 Gemfile                                 |  1 -
 beaker-vmpooler.gemspec                 |  7 ++++++-
 spec/beaker/hypervisor/vmpooler_spec.rb | 25 ++++++-------------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0f6f8d9..9604bb0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,6 @@ end
 # don't want to create a transitive dependency
 group :acceptance_testing do
   gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.0')
-  gem "beaker-abs", *location_for(ENV['ABS_VERSION'] || '~> 0.3.0')
 end
 
 
diff --git a/beaker-vmpooler.gemspec b/beaker-vmpooler.gemspec
index 1b195d5..28ce39a 100644
--- a/beaker-vmpooler.gemspec
+++ b/beaker-vmpooler.gemspec
@@ -20,7 +20,12 @@ Gem::Specification.new do |s|
   # Testing dependencies
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs', '~> 0.6'
+  # pin fakefs for Ruby < 2.3
+  if RUBY_VERSION < "2.3"
+    s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14'
+  else
+    s.add_development_dependency 'fakefs', '~> 0.6'
+  end
   s.add_development_dependency 'rake', '~> 10.1'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'
diff --git a/spec/beaker/hypervisor/vmpooler_spec.rb b/spec/beaker/hypervisor/vmpooler_spec.rb
index 067fc12..6e15662 100644
--- a/spec/beaker/hypervisor/vmpooler_spec.rb
+++ b/spec/beaker/hypervisor/vmpooler_spec.rb
@@ -4,10 +4,6 @@ module Beaker
   describe Vmpooler do
 
     before :each do
-      vms = make_hosts()
-      MockVsphereHelper.set_config( fog_file_contents )
-      MockVsphereHelper.set_vms( vms )
-      stub_const( "VsphereHelper", MockVsphereHelper )
       stub_const( "Net", MockNet )
       allow( JSON ).to receive( :parse ) do |arg|
         arg
@@ -147,20 +143,15 @@ module Beaker
     describe "#cleanup" do
 
       it "cleans up hosts in the pool" do
-        MockVsphereHelper.powerOn
-
+        mock_http = MockNet::HTTP.new( "host", "port" )
         vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
-        allow( vmpooler ).to receive( :require ).and_return( true )
-        allow( vmpooler ).to receive( :sleep ).and_return( true )
         vmpooler.provision
-        vmpooler.cleanup
+        vm_count = vmpooler.instance_variable_get( :@hosts ).count
 
-        hosts = vmpooler.instance_variable_get( :@hosts )
-        hosts.each do | host |
-          name = host.name
-          vm = MockVsphereHelper.find_vm( name )
-          expect( vm.runtime.powerState ).to be === "poweredOn" #handed back to the pool, stays on
-        end
+        expect( Net::HTTP ).to receive( :new ).exactly( vm_count ).times.and_return( mock_http )
+        expect( mock_http ).to receive( :request ).exactly( vm_count ).times
+        expect( Net::HTTP::Delete ).to receive( :new ).exactly( vm_count ).times
+        expect{ vmpooler.cleanup }.to_not raise_error
       end
     end
   end
@@ -168,10 +159,6 @@ module Beaker
   describe Vmpooler do
 
     before :each do
-      vms = make_hosts()
-      MockVsphereHelper.set_config( fog_file_contents )
-      MockVsphereHelper.set_vms( vms )
-      stub_const( "VsphereHelper", MockVsphereHelper )
       stub_const( "Net", MockNet )
       allow( JSON ).to receive( :parse ) do |arg|
         arg