Finally fixing #504, I think; I even have tests to prove it. It was a little thing, in the end.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2326 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 17 insertions, 0 deletions

diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index c9f785580..c53e292c8 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -605,6 +605,23 @@ end
         end
 
     end
+
+    def test_locking
+        master = mkclient
+
+        class << master
+            def getconfig
+                raise ArgumentError, "Just testing"
+            end
+        end
+
+        assert_raise(ArgumentError, "did not fail") do
+            master.run
+        end
+
+        assert(! master.send(:lockfile).locked?,
+            "Master is still locked after failure")
+    end
 end
 
 # $Id$