Merge pull request #3511 from boegel/fix_easystack_tests

tweak test_easystack_basic to get better error reporting if it fails

Author: migueldiascosta

test/framework/options.py

@@ -5621,7 +5621,7 @@ def test_easystack_basic(self):
         toy_easystack = os.path.join(topdir, 'easystacks', 'test_easystack_basic.yaml')
 
         args = ['--easystack', toy_easystack, '--stop', '--debug', '--experimental']
-        stdout, err = self.eb_main(args, do_build=True, return_error=True)
+        stdout = self.eb_main(args, do_build=True, raise_error=True)
         patterns = [
             r"[\S\s]*INFO Building from easystack:[\S\s]*",
             r"[\S\s]*DEBUG EasyStack parsed\. Proceeding to install these Easyconfigs:.*?[\n]"
@@ -5633,7 +5633,7 @@ def test_easystack_basic(self):
         ]
         for pattern in patterns:
             regex = re.compile(pattern)
-            self.assertTrue(regex.match(stdout) is not None)
+            self.assertTrue(regex.match(stdout), "Pattern '%s' should be found in: %s" % (regex.pattern, stdout))
 
     def test_easystack_wrong_structure(self):
         """Test for --easystack <easystack.yaml> when yaml easystack has wrong structure"""