[etch-devel] SF.net SVN: etch:[274] trunk

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

Revision: 274
          http://etch.svn.sourceforge.net/etch/?rev=274&view=rev
Author:   jheiss
Date:     2011-05-04 05:02:05 +0000 (Wed, 04 May 2011)

Log Message:
-----------
Change line that requires etchtest to be compatible with ruby 1.9

Modified Paths:
--------------
    trunk/Rakefile
    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_nodegroups.rb
    trunk/test/test_options.rb
    trunk/test/test_outputcapture.rb
    trunk/test/test_scripts.rb
    trunk/test/test_transitions.rb

Modified: trunk/Rakefile
===================================================================
--- trunk/Rakefile	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/Rakefile	2011-05-04 05:02:05 UTC (rev 274)
@@ -3,9 +3,9 @@
 # rake test
 Rake::TestTask.new do |t|
   # If the user hasn't already set the xmllib environment variable then set it
-  # to use LibXML so that the tests involving DTD validation are run.
+  # to use nokogiri so that the tests involving DTD validation are run.
   if !ENV['xmllib']
-    ENV['xmllib'] = 'libxml'
+    ENV['xmllib'] = 'nokogiri'
   end
   
   t.verbose = true

Modified: trunk/test/test_actions.rb
===================================================================
--- trunk/test/test_actions.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_actions.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of various actions:  pre, post, setup, test, etc.
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 class EtchActionTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_attributes.rb
===================================================================
--- trunk/test/test_attributes.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_attributes.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of attribute filtering in config.xml files
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 require 'rubygems'  # Might be needed to find facter
 require 'facter'
 

Modified: trunk/test/test_auth.rb
===================================================================
--- trunk/test/test_auth.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_auth.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of client authentication
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 require 'net/http'
 require 'rexml/document'
 begin

Modified: trunk/test/test_commands.rb
===================================================================
--- trunk/test/test_commands.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_commands.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of configuration commands
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 class EtchCommandTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_conf.rb
===================================================================
--- trunk/test/test_conf.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_conf.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of its configuration file, etch.conf
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 require 'net/http'
 require 'rexml/document'
 require 'cgi'

Modified: trunk/test/test_delete.rb
===================================================================
--- trunk/test/test_delete.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_delete.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of deleting files
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 class EtchDeleteTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_depend.rb
===================================================================
--- trunk/test/test_depend.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_depend.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of dependencies
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 class EtchDependTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_file.rb
===================================================================
--- trunk/test/test_file.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_file.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of creating and updating regular files
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 class EtchFileTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_history.rb
===================================================================
--- trunk/test/test_history.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_history.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -5,7 +5,7 @@
 # history files
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 class EtchHistoryTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_link.rb
===================================================================
--- trunk/test/test_link.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_link.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of creating and updating symbolic links
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 require 'pathname'
 
 class EtchLinkTests < Test::Unit::TestCase

Modified: trunk/test/test_local_requests.rb
===================================================================
--- trunk/test/test_local_requests.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_local_requests.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of local requests
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 class EtchLocalRequestsTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_nodegroups.rb
===================================================================
--- trunk/test/test_nodegroups.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_nodegroups.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test etch's handling of node groups and the node group hierarchy
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 class EtchNodeGroupTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_options.rb
===================================================================
--- trunk/test/test_options.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_options.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test command line options to etch client
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 require 'webrick'
 
 class EtchOptionTests < Test::Unit::TestCase

Modified: trunk/test/test_outputcapture.rb
===================================================================
--- trunk/test/test_outputcapture.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_outputcapture.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -4,7 +4,7 @@
 # Test output capturing
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 require 'timeout'
 $: << EtchTests::CLIENTDIR
 $: << File.join(EtchTests::SERVERDIR, 'lib')

Modified: trunk/test/test_scripts.rb
===================================================================
--- trunk/test/test_scripts.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_scripts.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -5,7 +5,7 @@
 # creation of links and directories, and control the deletion of files
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 class EtchScriptTests < Test::Unit::TestCase
   include EtchTests

Modified: trunk/test/test_transitions.rb
===================================================================
--- trunk/test/test_transitions.rb	2011-05-04 05:01:00 UTC (rev 273)
+++ trunk/test/test_transitions.rb	2011-05-04 05:02:05 UTC (rev 274)
@@ -5,7 +5,7 @@
 # file, etc.)
 #
 
-require File.join(File.dirname(__FILE__), 'etchtest')
+require "./#{File.dirname(__FILE__)}/etchtest"
 
 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.