Merge remote-tracking branch 'upstream/master'

mchf · Aug 1, 2012 · 6e6b5a8 · 6e6b5a8
2 parents 0d37b34 + 5bc380b
commit 6e6b5a8
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/libconfigagent/test/test_sysconfig.rb b/libconfigagent/test/test_sysconfig.rb
@@ -64,20 +64,18 @@ def test_stability
     test_file  = TEST_WORKING_DIR + TEST_STABILITY_IN_FILE
     orig_file = @data + TEST_STABILITY_IN_FILE
 
-    res = system( "cp #{orig_file} #{test_file}")
-
-    assert( res)
+    FileUtils.cp( orig_file, test_file)
 
     # perform the test
     agent = ConfigAgent::Sysconfig.new( { :path => test_file })
 
     agent.write( agent.read({}))
-    res = system( "diff #{test_file} #{orig_file}")
+    res = FileUtils.compare_file( test_file, orig_file)
 
     assert( res)
 
     # cleanup
-    system( "rm #{test_file}")
+    FileUtils.rm( test_file)
   end
 
   def test_new_value_write