Imported Upstream version 4.0.5

ipatests/test_cmdline/test_help.py

@@ -18,22 +18,15 @@
 #
 
 import sys
+import contextlib
+import StringIO
 
-import six
-from six import StringIO
+from nose.tools import assert_raises  # pylint: disable=E0611
 
 from ipalib import api, errors
-from ipaserver.plugins.user import user_add
-import pytest
-
-if six.PY3:
-    unicode = str
+from ipalib.plugins.user import user_add
 
 
-pytestmark = pytest.mark.needs_ipaapi
-
-
-@pytest.mark.tier0
 class CLITestContext(object):
     """Context manager that replaces stdout & stderr, and catches SystemExit
 
@@ -48,8 +41,8 @@ class CLITestContext(object):
 
     def __enter__(self):
         self.old_streams = sys.stdout, sys.stderr
-        self.stdout_fileobj = sys.stdout = StringIO()
-        self.stderr_fileobj = sys.stderr = StringIO()
+        self.stdout_fileobj = sys.stdout = StringIO.StringIO()
+        self.stderr_fileobj = sys.stderr = StringIO.StringIO()
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
@@ -117,7 +110,7 @@ def test_command_help():
     assert h_ctx.stderr == ''
 
     assert h_ctx.stdout == help_ctx.stdout
-    assert unicode(user_add.doc) in help_ctx.stdout
+    assert unicode(user_add.__doc__) in help_ctx.stdout
 
 
 def test_ambiguous_command_or_topic():
@@ -144,6 +137,6 @@ def test_multiline_description():
     assert '\n\n' in unicode(api.Command.trust_add.doc).strip()
 
     with CLITestContext(exception=SystemExit) as help_ctx:
-        api.Backend.cli.run(['trust-add', '-h'])
+        return_value = api.Backend.cli.run(['trust-add', '-h'])
 
     assert unicode(api.Command.trust_add.doc).strip() in help_ctx.stdout