fix unittest

MemVerge · Aug 1, 2023 · 83504f9 · 83504f9
1 parent c7d51e0
commit 83504f9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/plugins/nf-float/src/main/com/memverge/nextflow/FloatGridExecutor.groovy b/plugins/nf-float/src/main/com/memverge/nextflow/FloatGridExecutor.groovy
@@ -276,7 +276,7 @@ class FloatGridExecutor extends AbstractGridExecutor {
     }
 
     /**
-     * Parse the string returned by the {@code float sbatch} and extract
+     * Parse the string returned by the {@code float submit} and extract
      * the job ID string
      *
      * @param text The string returned when submitting the job

diff --git a/plugins/nf-float/src/test/com/memverge/nextflow/FloatBaseTest.groovy b/plugins/nf-float/src/test/com/memverge/nextflow/FloatBaseTest.groovy
@@ -105,7 +105,7 @@ class FloatBaseTest extends BaseTest {
         return ['float', '-a', param.addr ?: addr,
                 '-u', user,
                 '-p', pass,
-                'sbatch',
+                'submit',
                 '--dataVolume', param.nfs ?: nfs + ':' + workDir,
                 '--image', param.image ?: image,
                 '--cpu', param.cpu ?: cpu.toString(),

diff --git a/plugins/nf-float/src/test/com/memverge/nextflow/FloatGridExecutorMultiOCTest.groovy b/plugins/nf-float/src/test/com/memverge/nextflow/FloatGridExecutorMultiOCTest.groovy
@@ -60,9 +60,9 @@ class FloatGridExecutorMultiOCTest extends FloatBaseTest {
 
         then:
         cmd1.join(' ') == "float -a fa -u ${user} -p ${pass} " +
-                "squeue --format json"
+                "list --format json"
         cmd2.join(' ') == "float -a fb -u ${user} -p ${pass} " +
-                "squeue --format json"
+                "list --format json"
     }
 
     def "input multiple addresses as list"() {

diff --git a/plugins/nf-float/src/test/com/memverge/nextflow/FloatGridExecutorTest.groovy b/plugins/nf-float/src/test/com/memverge/nextflow/FloatGridExecutorTest.groovy
@@ -60,7 +60,7 @@ class FloatGridExecutorTest extends FloatBaseTest {
         cmd.join(' ') == ['float', '-a', addr,
                           '-u', user,
                           '-p', pass,
-                          'scancel', '-j', jobID].join(' ')
+                          'cancel', '-j', jobID].join(' ')
     }
 
     def "kill commands"() {
@@ -73,7 +73,7 @@ class FloatGridExecutorTest extends FloatBaseTest {
             return ['float', '-a', addr,
                     '-u', user,
                     '-p', pass,
-                    'scancel', '-j', jobID, '-f'].join(' ')
+                    'cancel', '-j', jobID, '-f'].join(' ')
         }
 
         then:
@@ -354,7 +354,7 @@ class FloatGridExecutorTest extends FloatBaseTest {
         cmd == ['float', '-a', addr,
                 '-u', user,
                 '-p', pass,
-                'squeue', '--format', 'json']
+                'list', '--format', 'json']
     }
 
     def "retrieve the credentials from env"() {