[Swift-commit] r3319 - in SwiftApps/adem-osg: . test

[noreply at svn.ci.uchicago.edu]

Author: aespinosa
Date: 2010-05-03 14:56:55 -0500 (Mon, 03 May 2010)
New Revision: 3319

Added:
   SwiftApps/adem-osg/test/dummy_config
Removed:
   SwiftApps/adem-osg/config
Modified:
   SwiftApps/adem-osg/test/test_run.rb
Log:
Updated RunTest dummy paths

Deleted: SwiftApps/adem-osg/config
===================================================================
--- SwiftApps/adem-osg/config	2010-05-03 19:56:52 UTC (rev 3318)
+++ SwiftApps/adem-osg/config	2010-05-03 19:56:55 UTC (rev 3319)
@@ -1,4 +0,0 @@
----
-ress_server: osg-ress-1.fnal.gov
-pacman_cache: http://www.ci.uchicago.edu/~aespinosa/Cybershake
-virtual_organization: engage

Copied: SwiftApps/adem-osg/test/dummy_config (from rev 3318, SwiftApps/adem-osg/config)
===================================================================
--- SwiftApps/adem-osg/test/dummy_config	                        (rev 0)
+++ SwiftApps/adem-osg/test/dummy_config	2010-05-03 19:56:55 UTC (rev 3319)
@@ -0,0 +1,4 @@
+---
+ress_server: osg-ress-1.fnal.gov
+pacman_cache: http://www.ci.uchicago.edu/~aespinosa/Cybershake
+virtual_organization: engage

Modified: SwiftApps/adem-osg/test/test_run.rb
===================================================================
--- SwiftApps/adem-osg/test/test_run.rb	2010-05-03 19:56:52 UTC (rev 3318)
+++ SwiftApps/adem-osg/test/test_run.rb	2010-05-03 19:56:55 UTC (rev 3319)
@@ -4,13 +4,16 @@
   include Adem::TestSetup
 
   def test_config
-    assert_equal(@conf, run_command(["config"], "config", nil))
+    assert_equal(@conf, run_command(["config"], "test/dummy_config", nil))
   end
 
   def test_sites_from_file
     conf = @conf
     site_list = YAML.load @site_list
     conf[:sites] = site_list
-    assert_equal(conf, run_command(["sites"], "config", "sites"))
+    assert_equal(
+      conf,
+      run_command(["sites"],"test/dummy_config", "test/dummy_sites")
+    )
   end
 end