From d50512ee72271f1e4ec9c33644ce8831f49021d5 Mon Sep 17 00:00:00 2001
From: Paul Thornthwaite <paul@brightbox.co.uk>
Date: Mon, 6 Feb 2012 11:49:30 +0000
Subject: [PATCH] Added check if Fog.mock! should be used in AWS tests

Without the check all tests were assumed mocked regardless of the
users environment setting.
---
 tests/aws/models/storage/directory_tests.rb | 2 +-
 tests/aws/models/storage/file_tests.rb      | 2 +-
 tests/aws/models/storage/files_tests.rb     | 2 +-
 tests/aws/models/storage/version_tests.rb   | 2 +-
 tests/aws/models/storage/versions_tests.rb  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/aws/models/storage/directory_tests.rb b/tests/aws/models/storage/directory_tests.rb
index 4c506fcde..8caa70923 100644
--- a/tests/aws/models/storage/directory_tests.rb
+++ b/tests/aws/models/storage/directory_tests.rb
@@ -1,4 +1,4 @@
-Fog.mock!
+Fog.mock! if ENV['FOG_MOCK']
 
 Shindo.tests("Storage[:aws] | directory", [:aws]) do
 
diff --git a/tests/aws/models/storage/file_tests.rb b/tests/aws/models/storage/file_tests.rb
index 04cac2c12..5e0d00b5c 100644
--- a/tests/aws/models/storage/file_tests.rb
+++ b/tests/aws/models/storage/file_tests.rb
@@ -1,4 +1,4 @@
-Fog.mock!
+Fog.mock! if ENV['FOG_MOCK']
 
 Shindo.tests("Storage[:aws] | file", [:aws]) do
 
diff --git a/tests/aws/models/storage/files_tests.rb b/tests/aws/models/storage/files_tests.rb
index 233c6eb99..e54a6e423 100644
--- a/tests/aws/models/storage/files_tests.rb
+++ b/tests/aws/models/storage/files_tests.rb
@@ -1,4 +1,4 @@
-Fog.mock!
+Fog.mock! if ENV['FOG_MOCK']
 
 Shindo.tests("Storage[:aws] | files", [:aws]) do
 
diff --git a/tests/aws/models/storage/version_tests.rb b/tests/aws/models/storage/version_tests.rb
index dd53fd819..d6dc5532b 100644
--- a/tests/aws/models/storage/version_tests.rb
+++ b/tests/aws/models/storage/version_tests.rb
@@ -1,4 +1,4 @@
-Fog.mock!
+Fog.mock! if ENV['FOG_MOCK']
 
 Shindo.tests("Storage[:aws] | version", [:aws]) do
 
diff --git a/tests/aws/models/storage/versions_tests.rb b/tests/aws/models/storage/versions_tests.rb
index 8c3bdef13..4e521d5f6 100644
--- a/tests/aws/models/storage/versions_tests.rb
+++ b/tests/aws/models/storage/versions_tests.rb
@@ -1,4 +1,4 @@
-Fog.mock!
+Fog.mock! if ENV['FOG_MOCK']
 
 Shindo.tests("Storage[:aws] | versions", [:aws]) do