From 5b232e5b2a8363e2245075620048f556f1e7fb1b Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 22 Dec 2016 17:03:56 +0100
Subject: [PATCH 1/2] Revert tag
---
version.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/version.txt b/version.txt
index b7b2123..339bd13 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.4.3b0
\ No newline at end of file
+1.4.2b0
--
GitLab
From 00c6750ff2e1580016181d3b403d2904353f45a3 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 22 Dec 2016 17:04:41 +0100
Subject: [PATCH 2/2] Make tests robust to spurions stderr messages caused by
broken libs on the environment
---
gridtk/tests/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gridtk/tests/__init__.py b/gridtk/tests/__init__.py
index c5568c9..817747e 100644
--- a/gridtk/tests/__init__.py
+++ b/gridtk/tests/__init__.py
@@ -165,7 +165,7 @@ class GridTKTest(unittest.TestCase):
self.assertTrue(os.path.isfile(out_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(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
jman.main(['./bin/jman', '--local', '--database', self.database, 'resubmit', '--running-jobs'])
@@ -185,7 +185,7 @@ class GridTKTest(unittest.TestCase):
self.assertTrue(os.path.isfile(out_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(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
files = os.listdir(self.log_dir)
--
GitLab