From 56fa149664e094ee65058a2720903b3fecb60018 Mon Sep 17 00:00:00 2001 From: geemus Date: Tue, 2 Nov 2010 11:44:10 -0700 Subject: [PATCH] don't redefine Fog.credentials (fixes odd occasional failing spec runs) --- lib/fog.rb | 4 ---- lib/fog/core/credentials.rb | 1 - 2 files changed, 5 deletions(-) diff --git a/lib/fog.rb b/lib/fog.rb index cf861784e..d0eaa5077 100644 --- a/lib/fog.rb +++ b/lib/fog.rb @@ -46,10 +46,6 @@ module Fog @bin = new_bin end - def self.credentials - {} - end - def self.mock! @mocking = true end diff --git a/lib/fog/core/credentials.rb b/lib/fog/core/credentials.rb index 4a5384bb2..214384a35 100644 --- a/lib/fog/core/credentials.rb +++ b/lib/fog/core/credentials.rb @@ -15,7 +15,6 @@ module Fog ENV["FOG_RC"] || '~/.fog' end - remove_method :credentials def credentials @credentials ||= begin path = File.expand_path(config_path)