afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refactored service function names

Browse source
This commit is contained in:
Blake J. Harnden 2018-06-22 14:41:06 -07:00
parent 0efcd910db
commit 8186f3716c
14 changed files with 127 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

35
daemon/tests/test_services.py
View file

@ -48,18 +48,21 @@ class TestServices:
assert ServiceManager.get("MyService")
assert ServiceManager.get("MyService2")
def test_service_defaults(self):
pass
def test_services_dependencies(self, session):
# given
services = [
ServiceA(),
ServiceB(),
ServiceC(),
ServiceD(),
ServiceF(),
ServiceA,
ServiceB,
ServiceC,
ServiceD,
ServiceF,
]
# when
startups = session.services.node_service_dependencies(services)
startups = session.services.node_boot_paths(services)
# then
assert len(startups) == 2
@ -67,28 +70,28 @@ class TestServices:
def test_services_dependencies_not_present(self, session):
# given
services = [
ServiceA(),
ServiceB(),
ServiceC(),
ServiceE()
ServiceA,
ServiceB,
ServiceC,
ServiceE
]
# when
with pytest.raises(ValueError):
session.services.node_service_dependencies(services)
session.services.node_boot_paths(services)
def test_services_dependencies_cycle(self, session):
# given
service_c = ServiceC()
service_c.dependencies = ("D",)
services = [
ServiceA(),
ServiceB(),
ServiceA,
ServiceB,
service_c,
ServiceD(),
ServiceF()
ServiceD,
ServiceF
]
# when
with pytest.raises(ValueError):
session.services.node_service_dependencies(services)
session.services.node_boot_paths(services)

8
daemon/tests/test_xml.py
View file

@ -93,10 +93,10 @@ class TestXml:
session.add_link(node.objid, ptp_node.objid, interface_one=interface)
# set custom values for node service
session.services.setcustomservice(node_one.objid, SshService.name)
session.services.set_service(node_one.objid, SshService.name)
service_file = SshService.configs[0]
file_data = "# test"
session.services.setservicefile(node_one.objid, SshService.name, service_file, file_data)
session.services.set_service_file(node_one.objid, SshService.name, service_file, file_data)
# instantiate session
session.instantiate()
@ -127,12 +127,12 @@ class TestXml:
session.open_xml(file_path, start=True)
# retrieve custom service
service = session.services.getcustomservice(node_one.objid, SshService.name)
service = session.services.get_service(node_one.objid, SshService.name)
# verify nodes have been recreated
assert session.get_object(n1_id)
assert session.get_object(n2_id)
assert service.configtxt.get(service_file) == file_data
assert service.config_data.get(service_file) == file_data
@pytest.mark.parametrize("version", _XML_VERSIONS)
def test_xml_mobility(self, session, tmpdir, version, ip_prefixes):