restore Windows test

quiltdata · Sep 5, 2024 · 3dba394 · 3dba394
1 parent e37984a
commit 3dba394
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/nio/QuiltFileSystemProvider.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/nio/QuiltFileSystemProvider.groovy
@@ -33,6 +33,7 @@ import java.nio.file.LinkOption
 import java.nio.file.NoSuchFileException
 import java.nio.file.OpenOption
 import java.nio.file.Path
+import java.nio.file.Paths
 import java.nio.file.StandardOpenOption
 import java.nio.file.attribute.BasicFileAttributeView
 import java.nio.file.attribute.BasicFileAttributes
@@ -309,7 +310,7 @@ class QuiltFileSystemProvider extends FileSystemProvider implements FileSystemTr
     }
 
     void checkRoot(Path path) {
-        if (path.toString() == '/') {
+        if (path == Paths.get('/')) {
             throw new UnsupportedOperationException("Operation 'checkRoot' not supported on root path")
         }
     }

diff --git a/plugins/nf-quilt/src/test/nextflow/quilt/QuiltObserverTest.groovy b/plugins/nf-quilt/src/test/nextflow/quilt/QuiltObserverTest.groovy
@@ -70,6 +70,9 @@ class QuiltObserverTest extends QuiltSpecification {
         where:
         s3_uri | quilt_uri
         's3://bucket/prefix/suffix' | 'quilt+s3://bucket#package=prefix%2fsuffix'
+        's3://bucket/prefix'        | 'quilt+s3://bucket#package=prefix%2fdefault_suffix'
+        's3://bucket'               | 'quilt+s3://bucket#package=default_prefix%2fdefault_suffix'
+        // 's3://bucket/folder/prefix/suffix' | 'quilt+s3://bucket#package=prefix%2fsuffix&dest=folder/prefix/suffix'
     }
 
     void 'should findOutputParams'() {

diff --git a/plugins/nf-quilt/src/test/nextflow/quilt/nio/QuiltFileSystemProviderTest.groovy b/plugins/nf-quilt/src/test/nextflow/quilt/nio/QuiltFileSystemProviderTest.groovy
@@ -10,8 +10,6 @@ import java.nio.file.CopyOption
 import java.nio.file.StandardCopyOption
 import java.nio.file.DirectoryStream
 import groovy.util.logging.Slf4j
-import spock.lang.IgnoreIf
-
 
 /**
  *
@@ -105,7 +103,6 @@ class QuiltFileSystemProviderTest extends QuiltSpecification {
         thrown java.nio.file.FileAlreadyExistsException
     }
 
-    @IgnoreIf({ System.getProperty('os.name').toLowerCase().contains('windows') })
     void 'should throw error when checkRoot is root'() {
         given:
         QuiltFileSystemProvider provider = new QuiltFileSystemProvider()