[ARVADOS] updated: 40f063c4f6aa35c641650c80751392292e151acb

git at public.curoverse.com git at public.curoverse.com
Thu Nov 26 21:08:41 EST 2015


Summary of changes:
 apps/workbench/test/helpers/download_helper.rb |  4 ++-
 apps/workbench/test/integration_helper.rb      | 44 ++++++++++++++++++++------
 2 files changed, 38 insertions(+), 10 deletions(-)

       via  40f063c4f6aa35c641650c80751392292e151acb (commit)
       via  6936d2cddf2874a7113159e9adcae8c8e67dc48f (commit)
       via  a1592e2c6d6e9768a1918f3c59b74d6d19033a55 (commit)
       via  8d7f3c9ae0648719781174946ea89c3505aabd22 (commit)
      from  76e2a1fc805e80f6882117848d99782b569b281c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 40f063c4f6aa35c641650c80751392292e151acb
Merge: 6936d2c a1592e2
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 26 21:16:57 2015 -0500

    Merge branch '7851-available-port' refs #7851


commit 6936d2cddf2874a7113159e9adcae8c8e67dc48f
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 26 21:16:16 2015 -0500

    Fix crash on removing nonexistent directory.
    
    No issue #

diff --git a/apps/workbench/test/helpers/download_helper.rb b/apps/workbench/test/helpers/download_helper.rb
index 8f387f4..776f0c7 100644
--- a/apps/workbench/test/helpers/download_helper.rb
+++ b/apps/workbench/test/helpers/download_helper.rb
@@ -6,7 +6,9 @@ module DownloadHelper
   end
 
   def clear
-    FileUtils.rm_r path
+    if File.exist? path
+      FileUtils.rm_r path
+    end
     begin
       Dir.mkdir path
     rescue Errno::EEXIST

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list