Fix Spack failing test

Signed-off-by: Paolo Di Tommaso <[email protected]>
nextflow-io · Jan 30, 2023 · 868374d · 868374d · pditommaso · Jan 31, 2023
1 parent 5e51718
commit 868374d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/modules/nextflow/src/main/groovy/nextflow/spack/SpackCache.groovy b/modules/nextflow/src/main/groovy/nextflow/spack/SpackCache.groovy
@@ -299,7 +299,7 @@ class SpackCache {
     }
 
     @PackageScope
-    int runCommand( String cmd ) {
+    void runCommand( String cmd ) {
         log.trace """spack env create
                      command: $cmd
                      timeout: $createTimeout""".stripIndent()
@@ -317,7 +317,6 @@ class SpackCache {
             msg += err.toString().trim().indent('    ')
             throw new IllegalStateException(msg)
         }
-        return status
     }
 
     /**

diff --git a/modules/nextflow/src/test/groovy/nextflow/spack/SpackCacheTest.groovy b/modules/nextflow/src/test/groovy/nextflow/spack/SpackCacheTest.groovy
@@ -117,7 +117,7 @@ class SpackCacheTest extends Specification {
         then:
         1 * cache.spackPrefixPath(ENV) >> PREFIX
         0 * cache.isYamlFilePath(ENV)
-        1 * cache.runCommand( "spack env activate $PREFIX ; spack install -y ; spack env deactivate" )
+        1 * cache.runCommand( "spack env activate $PREFIX ; spack install -y ; spack env deactivate" ) >> null
         result == PREFIX
 
         when:
	if( status != 0 ) {
	consumer.join()
	def msg = "Failed to create spack environment\n command: $cmd\n status : $status\n message:\n"
	msg += err.toString().trim().indent(' ')
	throw new IllegalStateException(msg)
	}