performa/os-faults
Code Issues Proposed changes

Move unit tests from os_faults/tests/ to os_faults/tests/unit/

Browse Source 
Change-Id: I56b25acb032f9a5ecf5d80b0f305b4ca5e9fff1d
This commit is contained in:
Yaroslav Lobankov 2016-09-27 13:24:27 +03:00
parent 32110d626c
commit f99be812f2
18 changed files with 111 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
os_faults/tests/ansible/__init__.py → os_faults/tests/unit/__init__.py
View File

0
os_faults/tests/ansible/modules/__init__.py → os_faults/tests/unit/ansible/__init__.py
View File

0
os_faults/tests/api/__init__.py → os_faults/tests/unit/ansible/modules/__init__.py
View File

2
os_faults/tests/ansible/modules/test_fule_network_mgmt.py → os_faults/tests/unit/ansible/modules/test_fule_network_mgmt.py
View File

@ -15,7 +15,7 @@ import ddt
import mock
from os_faults.ansible.modules import fuel_network_mgmt
from os_faults.tests import test
from os_faults.tests.unit import test
@ddt.ddt

0
os_faults/tests/drivers/__init__.py → os_faults/tests/unit/api/__init__.py
View File

2
os_faults/tests/api/test_human_api.py → os_faults/tests/unit/api/test_human_api.py
View File

@ -17,7 +17,7 @@ from os_faults.api import error
from os_faults.api import human
from os_faults.api import node_collection
from os_faults.api import service as service_api
from os_faults.tests import test
from os_faults.tests.unit import test
@ddt.ddt

0
os_faults/tests/unit/drivers/__init__.py Normal file
View File

21
os_faults/tests/drivers/test_devstack.py → os_faults/tests/unit/drivers/test_devstack.py
View File

@ -12,13 +12,14 @@
# limitations under the License.
import copy
import ddt
import mock
from os_faults.api import power_management
from os_faults.drivers import devstack
from os_faults.tests import fake
from os_faults.tests import test
from os_faults.tests.unit import fakes
from os_faults.tests.unit import test
class DevStackNodeTestCase(test.TestCase):
@ -74,7 +75,7 @@ class DevStackManagementTestCase(test.TestCase):
def test_verify(self, mock_ansible_runner):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[fake.FakeAnsibleResult(payload={'stdout': 'node1.com'})],
[fakes.FakeAnsibleResult(payload={'stdout': 'node1.com'})],
]
devstack_management = devstack.DevStackManagement(self.conf)
devstack_management.verify()
@ -86,21 +87,21 @@ class DevStackManagementTestCase(test.TestCase):
def test_execute(self, mock_ansible_runner):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[fake.FakeAnsibleResult(payload={'stdout': '/root'})],
[fakes.FakeAnsibleResult(payload={'stdout': '/root'})],
]
devstack_management = devstack.DevStackManagement(self.conf)
result = devstack_management.execute({'command': 'pwd'})
ansible_runner_inst.execute.assert_called_once_with(
['10.0.0.2'], {'command': 'pwd'})
self.assertEqual([fake.FakeAnsibleResult(payload={'stdout': '/root'})],
result)
self.assertEqual(
[fakes.FakeAnsibleResult(payload={'stdout': '/root'})], result)
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
def test_get_nodes(self, mock_ansible_runner):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[fake.FakeAnsibleResult(payload={'stdout': '09:7b:74:90:63:c1'})],
[fakes.FakeAnsibleResult(payload={'stdout': '09:7b:74:90:63:c1'})],
]
devstack_management = devstack.DevStackManagement(self.conf)
@ -121,7 +122,7 @@ class DevStackManagementTestCase(test.TestCase):
mock_ansible_runner):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[fake.FakeAnsibleResult(payload={'stdout': '09:7b:74:90:63:c1'})]
[fakes.FakeAnsibleResult(payload={'stdout': '09:7b:74:90:63:c1'})]
]
devstack_management = devstack.DevStackManagement(self.conf)
@ -150,8 +151,8 @@ class DevStackServiceTestCase(test.TestCase):
def test_restart(self, service_name, service_cls, mock_ansible_runner):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[fake.FakeAnsibleResult(payload={'stdout': '09:7b:74:90:63:c1'})],
[fake.FakeAnsibleResult(payload={'stdout': ''}, host='10.0.0.2')]
[fakes.FakeAnsibleResult(payload={'stdout': '09:7b:74:90:63:c1'})],
[fakes.FakeAnsibleResult(payload={'stdout': ''}, host='10.0.0.2')]
]
devstack_management = devstack.DevStackManagement(self.conf)

28
os_faults/tests/drivers/test_fuel_management.py → os_faults/tests/unit/drivers/test_fuel_management.py
View File

@ -16,8 +16,8 @@ import mock
from os_faults.ansible import executor
from os_faults.drivers import fuel
from os_faults.tests import fake
from os_faults.tests import test
from os_faults.tests.unit import fakes
from os_faults.tests.unit import test
@ddt.ddt
@ -26,7 +26,7 @@ class FuelManagementTestCase(test.TestCase):
def setUp(self):
super(FuelManagementTestCase, self).setUp()
self.fake_ansible_result = fake.FakeAnsibleResult(
self.fake_ansible_result = fakes.FakeAnsibleResult(
payload={'stdout': '[{"ip": "10.0.0.2", "mac": "02", "id": "2"},'
' {"ip": "10.0.0.3", "mac": "03", "id": "3"}]'})
@ -35,8 +35,8 @@ class FuelManagementTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''}),
fake.FakeAnsibleResult(payload={'stdout': ''})],
[fakes.FakeAnsibleResult(payload={'stdout': ''}),
fakes.FakeAnsibleResult(payload={'stdout': ''})],
]
fuel_managment = fuel.FuelManagement({
'address': 'fuel.local',
@ -72,8 +72,8 @@ class FuelManagementTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''}),
fake.FakeAnsibleResult(payload={'stdout': ''})]
[fakes.FakeAnsibleResult(payload={'stdout': ''}),
fakes.FakeAnsibleResult(payload={'stdout': ''})]
]
fuel_managment = fuel.FuelManagement({
'address': 'fuel.local',
@ -89,8 +89,8 @@ class FuelManagementTestCase(test.TestCase):
])
self.assertEqual(result,
[fake.FakeAnsibleResult(payload={'stdout': ''}),
fake.FakeAnsibleResult(payload={'stdout': ''})])
[fakes.FakeAnsibleResult(payload={'stdout': ''}),
fakes.FakeAnsibleResult(payload={'stdout': ''})])
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
def test_get_nodes_fqdns(self, mock_ansible_runner):
@ -119,11 +119,11 @@ class FuelManagementTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
status=executor.STATUS_FAILED,
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
[fakes.FakeAnsibleResult(payload={'stdout': ''},
status=executor.STATUS_FAILED,
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
]
fuel_managment = fuel.FuelManagement({

3
os_faults/tests/drivers/test_fuel_node_collection.py → os_faults/tests/unit/drivers/test_fuel_node_collection.py
View File

@ -12,12 +12,13 @@
# limitations under the License.
import copy
import mock
from os_faults.api import error
from os_faults.api import power_management
from os_faults.drivers import fuel
from os_faults.tests import test
from os_faults.tests.unit import test
class FuelNodeCollectionTestCase(test.TestCase):

148
os_faults/tests/drivers/test_fuel_service.py → os_faults/tests/unit/drivers/test_fuel_service.py
View File

@ -17,8 +17,8 @@ import mock
from os_faults.ansible import executor
from os_faults.api import error
from os_faults.drivers import fuel
from os_faults.tests import fake
from os_faults.tests import test
from os_faults.tests.unit import fakes
from os_faults.tests.unit import test
@ddt.ddt
@ -27,7 +27,7 @@ class FuelServiceTestCase(test.TestCase):
def setUp(self):
super(FuelServiceTestCase, self).setUp()
self.conf = {'address': 'fuel.local', 'username': 'root'}
self.fake_ansible_result = fake.FakeAnsibleResult(
self.fake_ansible_result = fakes.FakeAnsibleResult(
payload={'stdout': '[{"ip": "10.0.0.2", "mac": "02", "id": "2"},'
' {"ip": "10.0.0.3", "mac": "03", "id": "3"}]'})
@ -49,14 +49,14 @@ class FuelServiceTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
]
fuel_managment = fuel.FuelManagement(self.conf)
@ -91,14 +91,14 @@ class FuelServiceTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
]
fuel_managment = fuel.FuelManagement(self.conf)
@ -133,14 +133,14 @@ class FuelServiceTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
]
fuel_managment = fuel.FuelManagement(self.conf)
@ -177,14 +177,14 @@ class FuelServiceTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
]
fuel_managment = fuel.FuelManagement(self.conf)
@ -208,14 +208,14 @@ class FuelServiceTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
]
fuel_managment = fuel.FuelManagement(self.conf)
@ -240,14 +240,14 @@ class FuelServiceTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
]
fuel_managment = fuel.FuelManagement(self.conf)
@ -281,14 +281,14 @@ class FuelServiceTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
]
fuel_managment = fuel.FuelManagement(self.conf)
@ -310,15 +310,15 @@ class FuelServiceTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2',
status=executor.STATUS_FAILED),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2'),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')],
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2',
status=executor.STATUS_FAILED),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3')]
]
fuel_managment = fuel.FuelManagement(self.conf)
@ -340,12 +340,12 @@ class FuelServiceTestCase(test.TestCase):
ansible_runner_inst = mock_ansible_runner.return_value
ansible_runner_inst.execute.side_effect = [
[self.fake_ansible_result],
[fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2',
status=executor.STATUS_FAILED),
fake.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3',
status=executor.STATUS_FAILED)],
[fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.2',
status=executor.STATUS_FAILED),
fakes.FakeAnsibleResult(payload={'stdout': ''},
host='10.0.0.3',
status=executor.STATUS_FAILED)],
]
fuel_managment = fuel.FuelManagement(self.conf)

2
os_faults/tests/drivers/test_ipmi.py → os_faults/tests/unit/drivers/test_ipmi.py
View File

@ -16,7 +16,7 @@ import mock
from os_faults.drivers import ipmi
from os_faults import error
from os_faults.tests import test
from os_faults.tests.unit import test
@ddt.ddt

2
os_faults/tests/drivers/test_libvirt_driver.py → os_faults/tests/unit/drivers/test_libvirt_driver.py
View File

@ -15,7 +15,7 @@ import ddt
import mock
from os_faults.drivers import libvirt_driver
from os_faults.tests import test
from os_faults.tests.unit import test
DRIVER_PATH = 'os_faults.drivers.libvirt_driver'

0
os_faults/tests/fake.py → os_faults/tests/unit/fakes.py
View File

0
os_faults/tests/test.py → os_faults/tests/unit/test.py
View File

12
os_faults/tests/test_os_faults.py → os_faults/tests/unit/test_os_faults.py
View File

@ -10,24 +10,18 @@
# License for the specific language governing permissions and limitations
# under the License.
"""
test_os_faults
----------------------------------
Tests for `os_faults` module.
"""
import mock
import os
import yaml
import mock
import os_faults
from os_faults.api import error
from os_faults.drivers import devstack
from os_faults.drivers import fuel
from os_faults.drivers import ipmi
from os_faults.drivers import libvirt_driver
from os_faults.tests import test
from os_faults.tests.unit import test
class OSFaultsTestCase(test.TestCase):

2
os_faults/tests/test_utils.py → os_faults/tests/unit/test_utils.py
View File

@ -15,7 +15,7 @@ import threading
import mock
from os_faults.api import error
from os_faults.tests import test
from os_faults.tests.unit import test
from os_faults import utils

4
tox.ini
View File

@ -14,7 +14,7 @@ whitelist_externals = find
deps = -r{toxinidir}/test-requirements.txt
commands =
find . -type f -name "*.pyc" -delete
py.test -vvvv --html={envlogdir}/pytest_results.html --self-contained-html --durations=10 "os_faults/tests" {posargs}
py.test -vvvv --html={envlogdir}/pytest_results.html --self-contained-html --durations=10 "os_faults/tests/unit" {posargs}
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
[testenv:common-constraints]
@ -36,7 +36,7 @@ commands = {posargs}
[testenv:cover]
commands =
py.test --cov-config .coveragerc --cov-report html --cov=os_faults "os_faults/tests"
py.test --cov-config .coveragerc --cov-report html --cov=os_faults "os_faults/tests/unit"
coverage html -d {envlogdir}
coverage report