internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove nose from unittests (#54055)

Browse Source 
* Remove nose from unittests

This PR migrates the last of our unittests from using nose to using
pytest.  We don't need to install nose in our testing environments
anymore
This commit is contained in:
Toshio Kuratomi
2019-03-19 18:36:45 -07:00
committed by GitHub
parent dbb782a594
commit f5f4948480
6 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/runner/requirements/units.txt
View File

@@ -4,7 +4,6 @@ cryptography
pycrypto
jinja2
mock
nose
passlib
pytest
pytest-mock

4
test/sanity/validate-modules/test_validate_modules_regex.py
View File

@@ -6,10 +6,10 @@
# To execute this by hand:
# 1) cd <checkoutdir>
# 2) source hacking/env-setup
# 3) PYTHONPATH=./lib nosetests -d -w test -v --nocapture sanity/validate-modules
# 3) PYTHONPATH=./lib pytest -v sanity/validate-modules
import re
from ansible.compat.tests import unittest
import unittest
# TYPE_REGEX = re.compile(r'.*\stype\(.*')
# TYPE_REGEX = re.compile(r'.*(if|or)\stype\(.*')

12
test/units/modules/network/f5/test_bigip_gtm_facts.py
View File

@@ -10,9 +10,12 @@ import os
import json
import sys
from nose.plugins.skip import SkipTest
import pytest
pytestmark = []
if sys.version_info < (2, 7):
raise SkipTest("F5 Ansible modules require Python >= 2.7")
pytestmark.append(pytest.mark.skip("F5 Ansible modules require Python >= 2.7"))
from units.compat import unittest
from units.compat.mock import Mock
@@ -60,7 +63,10 @@ except ImportError:
from f5.utils.responses.handlers import Stats
from units.modules.utils import set_module_args
except ImportError:
raise SkipTest("F5 Ansible modules require the f5-sdk Python library")
pytestmark.append(pytest.mark.skip("F5 Ansible modules require the f5-sdk Python library"))
# pytestmark will cause this test to skip but we have to define A so that classes can be
# defined below
A = object
fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_data = {}

8
test/units/modules/network/f5/test_bigip_security_address_list.py
View File

@@ -11,9 +11,10 @@ import json
import pytest
import sys
from nose.plugins.skip import SkipTest
pytestmark = []
if sys.version_info < (2, 7):
raise SkipTest("F5 Ansible modules require Python >= 2.7")
pytestmark.append(pytest.mark.skip("F5 Ansible modules require Python >= 2.7"))
from units.compat import unittest
from units.compat.mock import Mock
@@ -38,7 +39,8 @@ except ImportError:
from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError
from units.modules.utils import set_module_args
except ImportError:
raise SkipTest("F5 Ansible modules require the f5-sdk Python library")
pytestmark.append(pytest.mark.skip("F5 Ansible modules require the f5-sdk Python library"))
fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_data = {}

8
test/units/modules/network/f5/test_bigip_security_port_list.py
View File

@@ -11,9 +11,10 @@ import json
import pytest
import sys
from nose.plugins.skip import SkipTest
pytestmark = []
if sys.version_info < (2, 7):
raise SkipTest("F5 Ansible modules require Python >= 2.7")
pytestmark.append(pytest.mark.skip("F5 Ansible modules require Python >= 2.7"))
from units.compat import unittest
from units.compat.mock import Mock
@@ -38,7 +39,8 @@ except ImportError:
from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError
from units.modules.utils import set_module_args
except ImportError:
raise SkipTest("F5 Ansible modules require the f5-sdk Python library")
pytestmark.append(pytest.mark.skip("F5 Ansible modules require the f5-sdk Python library"))
fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_data = {}