Changeset 763fcf6 in flex_extract.git

Timestamp:

Aug 31, 2018, 4:33:13 PM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

06c45e7

Parents:

451bb19

Message:

corrected function argument list of submit_job_to_ecgate

Location:

python

Files:

• install.py (modified) (1 diff)
• pythontest/TestTools.py (modified) (2 diffs)
• submit.py (modified) (2 diffs)

python/install.py

@@ -195 +195 @@
                              c.ecuid, c.ecgid)
 
-        submit_job_to_ecserver(ecd + '/python/', c.install_target,
-                               'compilejob.ksh')
+        result_code = submit_job_to_ecserver(ecd + '/python/', c.install_target,
+                                             'compilejob.ksh')
 
         print 'job compilation script has been submitted to ecgate for ' + \

python/pythontest/TestTools.py

@@ -121 +121 @@
     def test_fail_submit_job_to_ecserver(self):
         with pytest.raises(SystemExit) as pytest_wrapped_e:
-            submit_job_to_ecserver('${HOME}', 'ecgate', 'job.ksh')
+            submit_job_to_ecserver('ecgate', 'job.ksh')
         assert pytest_wrapped_e.type == SystemExit
         assert pytest_wrapped_e.value.code == '... ECACCESS-JOB-SUBMIT FAILED!'
@@ -127 +127 @@
     def test_success_submit_job_to_ecserver(self):
 
-        result = submit_job_to_ecserver('TestData/testfile.txt',
-                                        'ecgate', 'TestData/testfile.txt')
+        result = submit_job_to_ecserver('ecgate', 'TestData/testfile.txt')
         assert result == 0
 

python/submit.py

@@ -161 +161 @@
             f.write('\n'.join(lftextondemand))
 
-        submit_job_to_ecserver('', queue, job_file)
+        result_code = submit_job_to_ecserver(queue, job_file)
 
     else:
@@ -187 +187 @@
             f.write('\n'.join(lftextoper))
 
-        submit_job_to_ecserver('', queue, job_file)
+        result_code = submit_job_to_ecserver(queue, job_file)
 
     # --------------------------------------------------------------------------