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

fixed bug with custom service files using the same dict across instances of the class

Browse source
This commit is contained in:
Blake J. Harnden 2018-07-25 09:37:59 -07:00
parent 087a0f011b
commit 9ce28da658
2 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/service.py
View file

@ -761,13 +761,7 @@ class CoreService(object):
configuration is used to override their default parameters. configuration is used to override their default parameters.
""" """
self.custom = True self.custom = True
self.dirs = self.__class__.dirs self.config_data = self.__class__.config_data.copy()
self.configs = self.__class__.configs
self.startup = self.__class__.startup
self.shutdown = self.__class__.shutdown
self.validate = self.__class__.validate
self.meta = self.__class__.meta
self.config_data = self.__class__.config_data
@classmethod @classmethod
def on_load(cls): def on_load(cls):

44
daemon/tests/test_services.py
View file

@ -177,24 +177,48 @@ class TestServices:
# then # then
assert status assert status
def test_service_set_file(self, session): def test_service_custom_startup(self, session):
# given # given
ServiceManager.add_services(_SERVICES_PATH) ServiceManager.add_services(_SERVICES_PATH)
my_service = ServiceManager.get(SERVICE_ONE) my_service = ServiceManager.get(SERVICE_ONE)
node = session.add_node() node = session.add_node()
file_name = my_service.configs[0]
file_path = node.hostfilename(file_name)
file_data = "# custom file"
session.services.set_service_file(node.objid, my_service.name, file_name, file_data)
custom_service = session.services.get_service(node.objid, my_service.name)
# when # when
session.services.create_service_files(node, custom_service) session.services.set_service(node.objid, my_service.name)
custom_my_service = session.services.get_service(node.objid, my_service.name)
custom_my_service.startup = ("sh custom.sh",)
# then # then
assert os.path.exists(file_path) assert my_service.startup != custom_my_service.startup
with open(file_path, "r") as custom_file:
assert custom_file.read() == file_data def test_service_set_file(self, session):
# given
ServiceManager.add_services(_SERVICES_PATH)
my_service = ServiceManager.get(SERVICE_ONE)
node_one = session.add_node()
node_two = session.add_node()
file_name = my_service.configs[0]
file_data_one = "# custom file one"
file_data_two = "# custom file two"
session.services.set_service_file(node_one.objid, my_service.name, file_name, file_data_one)
session.services.set_service_file(node_two.objid, my_service.name, file_name, file_data_two)
# when
custom_service_one = session.services.get_service(node_one.objid, my_service.name)
session.services.create_service_files(node_one, custom_service_one)
custom_service_two = session.services.get_service(node_two.objid, my_service.name)
session.services.create_service_files(node_two, custom_service_two)
# then
file_path_one = node_one.hostfilename(file_name)
assert os.path.exists(file_path_one)
with open(file_path_one, "r") as custom_file:
assert custom_file.read() == file_data_one
file_path_two = node_two.hostfilename(file_name)
assert os.path.exists(file_path_two)
with open(file_path_two, "r") as custom_file:
assert custom_file.read() == file_data_two
def test_service_import(self): def test_service_import(self):
""" """