[etch-devel] SF.net SVN: etch:[203] trunk/test/etchtest.rb

[<jh...@us...>]

Revision: 203
          http://etch.svn.sourceforge.net/etch/?rev=203&view=rev
Author:   jheiss
Date:     2010-03-31 01:29:46 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
Fix the logic in start_server so that we call close! on the Tempfile
before repurposing it.  Otherwise we risk having Tempfile do its
automatic cleanup later on if the object hasn't yet be destroyed.

Modified Paths:
--------------
    trunk/test/etchtest.rb

Modified: trunk/test/etchtest.rb
===================================================================
--- trunk/test/etchtest.rb	2010-03-30 23:54:35 UTC (rev 202)
+++ trunk/test/etchtest.rb	2010-03-31 01:29:46 UTC (rev 203)
@@ -71,13 +71,15 @@
   def start_server(repo='no_repo_yet')
     # We want the running server's notion of the server base to be a symlink
     # that we can easily change later in swap_repository.
-    serverbase = Tempfile.new('etchtest').path
-    File.delete(serverbase)
+    serverbasefile = Tempfile.new('etchtest')
+    serverbase = serverbasefile.path
+    serverbasefile.close!
     File.symlink(repo, serverbase)
     ENV['etchserverbase'] = serverbase
     # Pick a random port in the 3001-6000 range (range somewhat randomly chosen)
     port = 3001 + rand(3000)
     if pid = fork
+      # FIXME: replace this with a check that the server has started
       puts "Giving the server some time to start up"
       sleep(5)
     else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.