Imported Debian patch 4.0.5-6~numeezy

ipatests/test_ipalib/test_cli.py

@@ -24,9 +24,6 @@ Test the `ipalib.cli` module.
 from ipatests.util import raises, get_api, ClassChecker
 from ipalib import cli, plugable, frontend, backend
 
-import pytest
-
-pytestmark = pytest.mark.tier0
 
 class test_textui(ClassChecker):
     _cls = cli.textui
@@ -35,8 +32,7 @@ class test_textui(ClassChecker):
         """
         Test the `ipalib.cli.textui.max_col_width` method.
         """
-        api = 'the api instance'
-        o = self.cls(api)
+        o = self.cls()
         e = raises(TypeError, o.max_col_width, 'hello')
         assert str(e) == 'rows: need %r or %r; got %r' % (list, tuple, 'hello')
         rows = [
@@ -94,7 +90,7 @@ class DummyAPI(object):
     Command = property(__get_cmd)
 
     def __cmd_iter(self, cnt):
-        for i in range(cnt):
+        for i in xrange(cnt):
             yield DummyCommand(get_cmd_name(i))
 
     def finalize(self):