Merge pull request #6266 from chef/lcg/fix-acceptance2

More acceptance test fixing.

2 files changed, 38 insertions, 22 deletions

diff --git a/acceptance/data-collector/.acceptance/data-collector-test/files/default/api.rb b/acceptance/data-collector/.acceptance/data-collector-test/files/default/api.rb
index 3fb2c730b0..fcfc704d29 100644
--- a/acceptance/data-collector/.acceptance/data-collector-test/files/default/api.rb
+++ b/acceptance/data-collector/.acceptance/data-collector-test/files/default/api.rb
@@ -17,35 +17,51 @@ module ApiHelpers
 end
 
 class Counter
-  def self.reset
-    @@counters = Hash.new { |h, k| h[k] = 0 }
-  end
+  class << self
+    attr_accessor :counters
 
-  def self.increment(payload)
-    counter_name = ApiHelpers.payload_type(payload)
-    @@counters[counter_name] += 1
-  end
+    def counters
+      @counters ||= Hash.new { |h, k| h[k] = 0 }
+    end
+
+    def reset
+      @counters = nil
+    end
+
+    def increment(payload)
+      counter_name = ApiHelpers.payload_type(payload)
+      counters[counter_name] += 1
+    end
 
-  def self.to_json
-    @@counters.to_json
+    def to_json
+      counters.to_json
+    end
   end
 end
 
 class MessageCache
   include ApiHelpers
 
-  def self.reset
-    @@message_cache = {}
-  end
+  class << self
+    attr_accessor :message_cache
 
-  def self.store(payload)
-    cache_key = ApiHelpers.payload_type(payload)
+    def message_cache
+      @message_cache ||= {}
+    end
 
-    @@message_cache[cache_key] = payload
-  end
+    def reset
+      @message_cache = nil
+    end
+
+    def store(payload)
+      cache_key = ApiHelpers.payload_type(payload)
+
+      message_cache[cache_key] = payload
+    end
 
-  def self.fetch(cache_key)
-    @@message_cache[cache_key].to_json
+    def fetch(cache_key)
+      message_cache[cache_key].to_json
+    end
   end
 end
 
diff --git a/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb b/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb
index 2ba4fe81fc..61915c54b7 100644
--- a/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb
+++ b/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb
@@ -1,6 +1,5 @@
 
-oldpath = ENV["PATH"]
-ENV["PATH"] = "/opt/chef/embedded/bin:#{ENV["PATH"]}"
+embedded_path = "/opt/chef/embedded/bin:#{ENV["PATH"]}"
 
 api_root_dir = "/var/opt/data_collector_api"
 
@@ -18,6 +17,7 @@ cookbook_file ::File.join(api_root_dir, "api.rb")
 
 execute "bundle install --binstubs" do
   cwd api_root_dir
+  environment({ "PATH" => embedded_path })
 end
 
 pid_file    = "/var/run/api.pid"
@@ -25,11 +25,13 @@ running_pid = ::File.exist?(pid_file) ? ::File.read(pid_file).strip : nil
 
 execute "kill existing API process" do
   command "kill #{running_pid}"
+  environment({ "PATH" => embedded_path })
   not_if { running_pid.nil? }
 end
 
 execute "start API" do
   command "bin/rackup -D -P #{pid_file}"
+  environment({ "PATH" => embedded_path })
   cwd api_root_dir
 end
 
@@ -40,5 +42,3 @@ directory "/etc/chef"
     source "client-rb-#{config_file}.rb"
   end
 end
-
-ENV["PATH"] = oldpath