[etch-devel] SF.net SVN: etch:[300] trunk/test

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

Revision: 300
          http://etch.svn.sourceforge.net/etch/?rev=300&view=rev
Author:   jheiss
Date:     2011-10-13 19:28:26 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Something seems to have changed such that __FILE__ is now a fully
qualified path.  As such our mechanism for requiring etchtest.rb in all
the test files has stopped working.  Switch it around to a cleaner
mechanism that uses File.expand_path so that it doesn't matter whether
we get the old or new __FILE__ behavior.

Modified Paths:
--------------
    trunk/test/test_actions.rb
    trunk/test/test_attributes.rb
    trunk/test/test_auth.rb
    trunk/test/test_commands.rb
    trunk/test/test_conf.rb
    trunk/test/test_delete.rb
    trunk/test/test_depend.rb
    trunk/test/test_file.rb
    trunk/test/test_history.rb
    trunk/test/test_link.rb
    trunk/test/test_local_requests.rb
    trunk/test/test_misc.rb
    trunk/test/test_nodegroups.rb
    trunk/test/test_options.rb
    trunk/test/test_outputcapture.rb
    trunk/test/test_scripts.rb
    trunk/test/test_transitions.rb

Modified: trunk/test/test_actions.rb
===================================================================
--- trunk/test/test_actions.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_actions.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of various actions:  pre, post, setup, test, etc.
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchActionTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_attributes.rb
===================================================================
--- trunk/test/test_attributes.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_attributes.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of attribute filtering in config.xml files
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 require 'rubygems'  # Might be needed to find facter
 require 'facter'
 

Modified: trunk/test/test_auth.rb
===================================================================
--- trunk/test/test_auth.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_auth.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of client authentication
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 require 'net/http'
 require 'rexml/document'
 begin

Modified: trunk/test/test_commands.rb
===================================================================
--- trunk/test/test_commands.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_commands.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of configuration commands
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchCommandTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_conf.rb
===================================================================
--- trunk/test/test_conf.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_conf.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of its configuration file, etch.conf
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 require 'net/http'
 require 'rexml/document'
 require 'cgi'

Modified: trunk/test/test_delete.rb
===================================================================
--- trunk/test/test_delete.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_delete.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of deleting files
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchDeleteTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_depend.rb
===================================================================
--- trunk/test/test_depend.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_depend.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of dependencies
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchDependTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_file.rb
===================================================================
--- trunk/test/test_file.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_file.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of creating and updating regular files
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchFileTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_history.rb
===================================================================
--- trunk/test/test_history.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_history.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -5,7 +5,7 @@
 # history files
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchHistoryTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_link.rb
===================================================================
--- trunk/test/test_link.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_link.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of creating and updating symbolic links
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 require 'pathname'
 
 class EtchLinkTests < Test::Unit::TestCase

Modified: trunk/test/test_local_requests.rb
===================================================================
--- trunk/test/test_local_requests.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_local_requests.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of local requests
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchLocalRequestsTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_misc.rb
===================================================================
--- trunk/test/test_misc.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_misc.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test miscellaneous items that don't fit elsewhere
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 require 'webrick'
 
 class EtchMiscTests < Test::Unit::TestCase

Modified: trunk/test/test_nodegroups.rb
===================================================================
--- trunk/test/test_nodegroups.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_nodegroups.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test etch's handling of node groups and the node group hierarchy
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchNodeGroupTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_options.rb
===================================================================
--- trunk/test/test_options.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_options.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test command line options to etch client
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 require 'webrick'
 
 class EtchOptionTests < Test::Unit::TestCase

Modified: trunk/test/test_outputcapture.rb
===================================================================
--- trunk/test/test_outputcapture.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_outputcapture.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -4,7 +4,7 @@
 # Test output capturing
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 require 'timeout'
 $:.unshift(File.join(EtchTests::CLIENTDIR, 'lib'))
 $:.unshift(File.join(EtchTests::SERVERDIR, 'lib'))

Modified: trunk/test/test_scripts.rb
===================================================================
--- trunk/test/test_scripts.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_scripts.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -5,7 +5,7 @@
 # creation of links and directories, and control the deletion of files
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchScriptTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_transitions.rb
===================================================================
--- trunk/test/test_transitions.rb	2011-08-15 21:49:55 UTC (rev 299)
+++ trunk/test/test_transitions.rb	2011-10-13 19:28:26 UTC (rev 300)
@@ -5,7 +5,7 @@
 # file, etc.)
 #
 
-require "./#{File.dirname(__FILE__)}/etchtest"
+require File.expand_path('etchtest', File.dirname(__FILE__))
 
 class EtchTransitionTests < Test::Unit::TestCase
   include EtchTests

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