Fix tests #1288

vatlab · Aug 21, 2019 · baca625 · baca625
1 parent 191d7f3
commit baca625
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 49 deletions.
diff --git a/test/test_execute.py b/test/test_execute.py
@@ -2310,7 +2310,7 @@ def testKillTask(self):
 import time
 time.sleep(10)
 ''')
-        ret = subprocess.Popen(['sos', 'run', 'testKillTask', '-s', 'force'])
+        ret = subprocess.Popen(['sos', 'run', 'testKillTask', '-s', 'force', '-q', 'localhost'])
         proc = psutil.Process(ret.pid)
         while True:
             children = proc.children(recursive=True)
@@ -2325,7 +2325,7 @@ def testKillTask(self):
         ret.wait()
         self.assertNotEqual(ret.returncode, 0)
         #
-        ret = subprocess.Popen(['sos', 'run', 'testKillTask'])
+        ret = subprocess.Popen(['sos', 'run', 'testKillTask', '-q', 'localhost'])
         proc = psutil.Process(ret.pid)
         while True:
             children = proc.children(recursive=True)
@@ -2348,8 +2348,8 @@ def testConcurrentRunningTasks(self):
 import time
 time.sleep(5)
 ''')
-        ret1 = subprocess.Popen(['sos', 'run', 'testRunTask', '-s', 'force'])
-        ret2 = subprocess.Popen(['sos', 'run', 'testRunTask', '-s', 'force'])
+        ret1 = subprocess.Popen(['sos', 'run', 'testRunTask', '-s', 'force', '-q', 'localhost'])
+        ret2 = subprocess.Popen(['sos', 'run', 'testRunTask', '-s', 'force', '-q', 'localhost'])
         ret1.wait()
         ret2.wait()
         self.assertEqual(ret1.returncode, 0)
@@ -2369,7 +2369,7 @@ def testRestartOrphanedTasks(self):
 import time
 time.sleep(12)
 ''')
-        ret = subprocess.Popen(['sos', 'run', 'testOrphan', '-s', 'force'])
+        ret = subprocess.Popen(['sos', 'run', 'testOrphan', '-s', 'force', '-q', 'localhost'])
         proc = psutil.Process(ret.pid)
         while True:
             children = proc.children(recursive=True)
@@ -2383,7 +2383,7 @@ def testRestartOrphanedTasks(self):
             time.sleep(0.1)
         proc.kill()
         #
-        ret = subprocess.Popen(['sos', 'run', 'testOrphan'])
+        ret = subprocess.Popen(['sos', 'run', 'testOrphan', '-q', 'localhost'])
         ret.wait()
         self.assertEqual(ret.returncode, 0)
 

diff --git a/test/test_nested.py b/test/test_nested.py
@@ -597,7 +597,7 @@ def testNestedWorkdir(self):
 ''')
         wf = script.workflow()
         # this should be ok.
-        Base_Executor(wf).run()
+        Base_Executor(wf, config={'default_queue': 'localhost'}).run()
         os.path.isfile('tmp/tmp/a.txt')
         shutil.rmtree('tmp')
 

diff --git a/test/test_parser.py b/test/test_parser.py
@@ -2017,7 +2017,7 @@ def testTaskParamVar(self):
         echo 1
 ''')
         wf = script.workflow()
-        Base_Executor(wf).run()
+        Base_Executor(wf, config={'default_queue': 'localhost'}).run()
 
     def testTaskParamVarToSubstep(self):
         '''Test global parameter passed to task parameters in substep #1281'''
@@ -2033,7 +2033,7 @@ def testTaskParamVarToSubstep(self):
         echo {i}
 ''')
         wf = script.workflow()
-        Base_Executor(wf).run()
+        Base_Executor(wf, config={'default_queue': 'localhost'}).run()
 
     def testEmptyParameter(self):
         # parameter: without content #1283

diff --git a/test/test_remote.py b/test/test_remote.py
@@ -73,7 +73,7 @@ def testRemoteExecute(self):
 ''')
         self.assertEqual(
             subprocess.call(
-                'sos run test_remote.sos -c ~/docker.yml -r docker -s force',
+                'sos run test_remote.sos -c ~/docker.yml -r docker -s force -q localhost',
                 shell=True), 0)
         self.assertFalse(file_target('result_remote.txt').target_exists())
         #self.assertEqual(subprocess.call('sos preview result_remote.txt -c ~/docker.yml -r docker', shell=True), 0)
@@ -245,6 +245,7 @@ def testWorkerProcsWithTask(self):
             wf,
             config={
                 'sig_mode': 'force',
+                'default_queue': 'localhost',
                 'worker_proces': ['1', 'localhost:2'],
             }).run()
 

diff --git a/test/test_signature.py b/test/test_signature.py
@@ -170,7 +170,7 @@ def _testSignature(self, text, steps):
         # only the first step
         wf = script.workflow(':0')
         env.config['sig_mode'] = 'force'
-        res = Base_Executor(wf).run()
+        res = Base_Executor(wf, config={'default_queue': 'localhost'}).run()
         self.assertTrue(os.path.isfile('temp/a.txt'))
         self.assertTrue(os.path.isfile('temp/b.txt'))
         self.assertTrue(res['__completed__']['__step_completed__'], steps)
@@ -179,16 +179,16 @@ def _testSignature(self, text, steps):
         with open('temp/b.txt') as tb:
             self.assertTrue(tb.read(), 'b.txt')
         env.config['sig_mode'] = 'assert'
-        res = Base_Executor(wf).run()
+        res = Base_Executor(wf, config={'default_queue': 'localhost'}).run()
         self.assertEqual(res['__completed__']['__step_completed__'], 0)
         # all of them
         wf = script.workflow()
         env.config['sig_mode'] = 'default'
         # generate files (default step 0 and 1)
-        Base_Executor(wf).run()
+        Base_Executor(wf, config={'default_queue': 'localhost'}).run()
         # now, rerun in build mode
         env.config['sig_mode'] = 'build'
-        res = Base_Executor(wf).run()
+        res = Base_Executor(wf, config={'default_queue': 'localhost'}).run()
         self.assertEqual(res['__completed__']['__step_completed__'], 0)
         #
         self.assertTrue(os.path.isfile('temp/c.txt'))
@@ -202,20 +202,20 @@ def _testSignature(self, text, steps):
         #
         # now in assert mode, the signature should be there
         env.config['sig_mode'] = 'assert'
-        res = Base_Executor(wf).run()
+        res = Base_Executor(wf, config={'default_queue': 'localhost'}).run()
         self.assertEqual(res['__completed__']['__step_completed__'], 0)
 
         #
         env.config['sig_mode'] = 'default'
-        res = Base_Executor(wf).run()
+        res = Base_Executor(wf, config={'default_queue': 'localhost'}).run()
         self.assertEqual(res['__completed__']['__step_completed__'], 0)
 
         #
         # change script a little bit
         script = SoS_Script('# comment\n' + text)
         wf = script.workflow()
         env.config['sig_mode'] = 'assert'
-        res = Base_Executor(wf).run()
+        res = Base_Executor(wf, config={'default_queue': 'localhost'}).run()
         self.assertEqual(res['__completed__']['__step_completed__'], 0)
 
         # add some other variable?
@@ -597,7 +597,7 @@ def testSignatureWithWithoutTask(self):
   echo aa > aa
 ''')
         wf = script.workflow()
-        res = Base_Executor(wf).run()
+        res = Base_Executor(wf, config={'default_queue': 'localhost'}).run()
         self.assertEqual(res['__completed__']['__step_completed__'], 0)
 
     def testSignatureWithDynamicOutput(self):