Imported Debian patch 4.0.5-6~numeezy

2016-02-17 15:07:45 +01:00
parent c44de33144
commit 10dfc9587b
1203 changed files with 53869 additions and 241462 deletions
--- a/ipatests/test_ipaserver/test_install/test_adtrustinstance.py
+++ b/ipatests/test_ipaserver/test_install/test_adtrustinstance.py
@@ -21,18 +21,10 @@ Test `adtrustinstance`
 """

 import os
-
-import six
 import nose
-import pytest

 from ipaserver.install import adtrustinstance

-if six.PY3:
-    unicode = str
-
-
-@pytest.mark.tier0
 class test_adtrustinstance:
    """
    Test `adtrustinstance`.