Merge "Cleanup error messages on failure"

Author: Zuul

openstackclient/tests/functional/common/test_help.py

@@ -60,8 +60,12 @@ def test_server_commands_main_help(self):
         """Check server commands in main help message."""
         raw_output = self.openstack('help')
         for command, description in self.SERVER_COMMANDS:
-            self.assertIn(command, raw_output)
-            self.assertIn(description, raw_output)
+            msg = 'Command: %s not found in help output:\n%s' % (
+                command, raw_output)
+            self.assertIn(command, raw_output, msg)
+            msg = 'Description: %s not found in help output:\n%s' % (
+                description, raw_output)
+            self.assertIn(description, raw_output, msg)
 
     def test_server_only_help(self):
         """Check list of server-related commands only."""