Imported Debian patch 4.0.5-6~numeezy

ipatests/test_pkcs10/test_pkcs10.py

@@ -20,26 +20,21 @@
 Test the `pkcs10.py` module.
 """
 
-# FIXME: Pylint errors
-# pylint: disable=no-member
-
-import binascii
-
+import os
+import sys
 import nose
+from ipatests.util import raises, PluginTester
 from ipalib import pkcs10
 from ipapython import ipautil
 import nss.nss as nss
 from nss.error import NSPRError
-import pytest
 
-
-@pytest.mark.tier0
 class test_update(object):
     """
     Test the PKCS#10 Parser.
     """
 
-    def setup(self):
+    def setUp(self):
         nss.nss_init_nodb()
         if ipautil.file_exists("test0.csr"):
             self.testdir="./"
@@ -113,7 +108,7 @@ class test_update(object):
 
         try:
             request = pkcs10.load_certificate_request(csr)
-        except NSPRError as nsprerr:
+        except NSPRError, nsprerr:
             # (SEC_ERROR_BAD_DER) security library: improperly formatted DER-encoded message.
             assert(nsprerr. errno== -8183)
 
@@ -124,5 +119,5 @@ class test_update(object):
         csr = self.read_file("test4.csr")
         try:
             request = pkcs10.load_certificate_request(csr)
-        except (TypeError, binascii.Error) as typeerr:
+        except TypeError, typeerr:
             assert(str(typeerr) == 'Incorrect padding')