Merge pull request #618 from tenderlove/random-fail

Fix random test failure

Author: tenderlove

test/config_test.rb

@@ -18,7 +18,7 @@ def test_read_config_from_path
 
   def test_read_global_config_file
     config = Rugged::Config.global
-    assert config['user.name'] != nil
+    refute_nil config['user.name']
     assert_nil config['core.bare']
   end
 

test/lib_test.rb

@@ -34,8 +34,14 @@ def test_search_path
              ['search_path_system', '/tmp/system']]
 
     paths.each do |opt, path|
+      before = Rugged::Settings[opt]
       Rugged::Settings[opt] = path
-      assert_equal(path, Rugged::Settings[opt])
+
+      begin
+        assert_equal(path, Rugged::Settings[opt])
+      ensure
+        Rugged::Settings[opt] = before
+      end
     end
   end