Commit 7f34cb98 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'fixes' into 'master'

Fixes

* Closes issue #14 
* Untag version v1.4.2

See merge request !3
parents 8a755cc0 00c6750f
Pipeline #6012 passed with stages
in 2 minutes and 41 seconds
...@@ -165,7 +165,7 @@ class GridTKTest(unittest.TestCase): ...@@ -165,7 +165,7 @@ class GridTKTest(unittest.TestCase):
self.assertTrue(os.path.isfile(out_file)) self.assertTrue(os.path.isfile(out_file))
self.assertTrue(os.path.isfile(err_file)) self.assertTrue(os.path.isfile(err_file))
self.assertEqual(open(out_file).read().rstrip(), 'This is a text message to std-out') self.assertEqual(open(out_file).read().rstrip(), 'This is a text message to std-out')
self.assertEqual(open(err_file).read().split('\n')[0], 'This is a text message to std-err') self.assertTrue('This is a text message to std-err' in open(err_file).read().split('\n'))
# resubmit all jobs # resubmit all jobs
jman.main(['./bin/jman', '--local', '--database', self.database, 'resubmit', '--running-jobs']) jman.main(['./bin/jman', '--local', '--database', self.database, 'resubmit', '--running-jobs'])
...@@ -185,7 +185,7 @@ class GridTKTest(unittest.TestCase): ...@@ -185,7 +185,7 @@ class GridTKTest(unittest.TestCase):
self.assertTrue(os.path.isfile(out_file)) self.assertTrue(os.path.isfile(out_file))
self.assertTrue(os.path.isfile(err_file)) self.assertTrue(os.path.isfile(err_file))
self.assertEqual(open(out_file).read().rstrip(), 'This is a text message to std-out') self.assertEqual(open(out_file).read().rstrip(), 'This is a text message to std-out')
self.assertEqual(open(err_file).read().split('\n')[1], 'This is a text message to std-err') self.assertTrue('This is a text message to std-err' in open(err_file).read().split('\n'))
# check that exactly four output and four error files have been created # check that exactly four output and four error files have been created
files = os.listdir(self.log_dir) files = os.listdir(self.log_dir)
......
1.4.3b0 1.4.2b0
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment