IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace nose with unittest and pytest

Browse Source 
* Replace raise nose.SkipTest with raise unittest.SkipTest
* Replace nose.tools.assert_equal(a, b) with assert a == b
* Replace nose.tools.raises with pytest.raises
* Convert @raises decorator to pytest.raises() but just for relevant
  lines.
* Remove nose dependency

I left the nose_compat pytest plugin in place. It can be removed in
another request in case it is no longer used.

https://pagure.io/freeipa/issue/7301

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes
2017-12-06 17:01:57 +01:00
parent 6a8c84718d
commit d7426ccbe7
31 changed files with 385 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ipatests/test_integration/test_caless.py
View File

@@ -23,7 +23,8 @@ import tempfile
import shutil
import glob
import contextlib
import nose
import unittest
import pytest
import six
@@ -604,7 +605,7 @@ class TestServerInstall(CALessBase):
dirsrv_pkcs12='dirsrv.p12')
if result.returncode == 0:
raise nose.SkipTest(
raise unittest.SkipTest(
"Known CA-less installation defect, see "
"https://fedorahosted.org/freeipa/ticket/4270")
@@ -622,7 +623,7 @@ class TestServerInstall(CALessBase):
dirsrv_pkcs12='dirsrv.p12')
if result.returncode == 0:
raise nose.SkipTest(
raise unittest.SkipTest(
"Known CA-less installation defect, see "
"https://fedorahosted.org/freeipa/ticket/4270")
@@ -968,7 +969,7 @@ class TestReplicaInstall(CALessBase):
dirsrv_pkcs12='dirsrv.p12')
if result.returncode == 0:
raise nose.SkipTest(
raise unittest.SkipTest(
"Known CA-less installation defect, see "
"https://fedorahosted.org/freeipa/ticket/4270")
@@ -985,7 +986,7 @@ class TestReplicaInstall(CALessBase):
dirsrv_pkcs12='dirsrv.p12')
if result.returncode == 0:
raise nose.SkipTest(
raise unittest.SkipTest(
"Known CA-less installation defect, see "
"https://fedorahosted.org/freeipa/ticket/4270")
@@ -1368,7 +1369,7 @@ class TestCertInstall(CALessBase):
result = self.certinstall('w', 'ca1/server-revoked')
if result.returncode == 0:
raise nose.SkipTest(
raise unittest.SkipTest(
"Known CA-less installation defect, see "
"https://fedorahosted.org/freeipa/ticket/4270")
@@ -1380,7 +1381,7 @@ class TestCertInstall(CALessBase):
result = self.certinstall('d', 'ca1/server-revoked')
if result.returncode == 0:
raise nose.SkipTest(
raise unittest.SkipTest(
"Known CA-less installation defect, see "
"https://fedorahosted.org/freeipa/ticket/4270")