From 47ca2bc45a293e9046ac22c75b9ca3b9b4a811f0 Mon Sep 17 00:00:00 2001
From: Dylan Egan <dylanegan@gmail.com>
Date: Tue, 12 Jul 2011 13:05:54 +1000
Subject: [PATCH] Clean up timeout and add tests.

---
 lib/fog/core/timeout.rb     | 17 +++++++----------
 tests/core/timeout_tests.rb | 10 ++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 tests/core/timeout_tests.rb

diff --git a/lib/fog/core/timeout.rb b/lib/fog/core/timeout.rb
index 705d1f3f2..7607d4f39 100644
--- a/lib/fog/core/timeout.rb
+++ b/lib/fog/core/timeout.rb
@@ -1,13 +1,10 @@
 module Fog
+  def self.timeout
+    @timeout ||= 600
+  end
 
-    @timeout = 600
-    def self.timeout
-      @timeout
-    end
-
-    def self.timeout=(new_timeout)
-      raise ArgumentError, "timeout must be non-negative" unless new_timeout >= 0
-      @timeout = new_timeout
-    end
-
+  def self.timeout=(timeout)
+    raise ArgumentError, "timeout must be non-negative" unless timeout >= 0
+    @timeout = timeout
+  end
 end
diff --git a/tests/core/timeout_tests.rb b/tests/core/timeout_tests.rb
new file mode 100644
index 000000000..590287fd2
--- /dev/null
+++ b/tests/core/timeout_tests.rb
@@ -0,0 +1,10 @@
+Shindo.tests('Fog#timeout', 'core') do
+  tests('timeout').returns(600) do
+    Fog.timeout
+  end
+
+  tests('timeout = 300').returns(300) do
+    Fog.timeout = 300
+    Fog.timeout
+  end
+end