|
@@ -1,6 +1,7 @@
|
|
|
import unittest
|
|
|
import mock
|
|
|
|
|
|
+from kalliope.core.Models.Resources import Resources
|
|
|
from kalliope.core.NeuronLauncher import NeuronLauncher
|
|
|
from kalliope.core.SynapseLauncher import SynapseLauncher, SynapseNameNotFound
|
|
|
from kalliope.core.TriggerLauncher import TriggerLauncher
|
|
@@ -33,7 +34,7 @@ class TestLaunchers(unittest.TestCase):
|
|
|
callback=None)
|
|
|
|
|
|
mock_get_class_instantiation.assert_called_once_with(package_name="trigger",
|
|
|
- module_name=trigger.name.capitalize(),
|
|
|
+ module_name=trigger.name,
|
|
|
parameters=trigger.parameters)
|
|
|
mock_get_class_instantiation.reset_mock()
|
|
|
|
|
@@ -70,11 +71,11 @@ class TestLaunchers(unittest.TestCase):
|
|
|
SynapseLauncher.start_synapse("Synapse1", brain=br)
|
|
|
|
|
|
calls = [mock.call(package_name="neurons",
|
|
|
- module_name=neuron1.name.capitalize(),
|
|
|
+ module_name=neuron1.name,
|
|
|
parameters=neuron1.parameters,
|
|
|
resources_dir='/var/tmp/test/resources'),
|
|
|
mock.call(package_name="neurons",
|
|
|
- module_name=neuron2.name.capitalize(),
|
|
|
+ module_name=neuron2.name,
|
|
|
parameters=neuron2.parameters,
|
|
|
resources_dir='/var/tmp/test/resources')]
|
|
|
mock_get_class_instantiation.assert_has_calls(calls=calls)
|
|
@@ -94,18 +95,19 @@ class TestLaunchers(unittest.TestCase):
|
|
|
synapse1 = Synapse(name="Synapse1", neurons=[neuron1, neuron2], signals=[signal1])
|
|
|
synapse_empty = Synapse(name="Synapse_empty", neurons=[], signals=[signal1])
|
|
|
sl = SettingLoader()
|
|
|
- sl.settings.resource_dir = '/var/tmp/test/resources'
|
|
|
+ resources = Resources(neuron_folder='/var/tmp/test/resources')
|
|
|
+ sl.settings.resources = resources
|
|
|
with mock.patch("kalliope.core.Utils.get_dynamic_class_instantiation") as mock_get_class_instantiation:
|
|
|
SynapseLauncher._run_synapse(synapse=synapse1)
|
|
|
|
|
|
calls = [mock.call(package_name="neurons",
|
|
|
- module_name=neuron1.name.capitalize(),
|
|
|
+ module_name=neuron1.name,
|
|
|
parameters=neuron1.parameters,
|
|
|
- resources_dir='/var/tmp/test/resources'),
|
|
|
+ resources_dir="/var/tmp/test/resources"),
|
|
|
mock.call(package_name="neurons",
|
|
|
- module_name=neuron2.name.capitalize(),
|
|
|
+ module_name=neuron2.name,
|
|
|
parameters=neuron2.parameters,
|
|
|
- resources_dir='/var/tmp/test/resources')]
|
|
|
+ resources_dir="/var/tmp/test/resources")]
|
|
|
mock_get_class_instantiation.assert_has_calls(calls=calls)
|
|
|
mock_get_class_instantiation.reset_mock()
|
|
|
|
|
@@ -122,13 +124,14 @@ class TestLaunchers(unittest.TestCase):
|
|
|
"""
|
|
|
neuron = Neuron(name='neurone1', parameters={'var1': 'val1'})
|
|
|
sl = SettingLoader()
|
|
|
- sl.settings.resource_dir = '/var/tmp/test/resources'
|
|
|
+ resources = Resources(neuron_folder='/var/tmp/test/resources')
|
|
|
+ sl.settings.resources = resources
|
|
|
with mock.patch("kalliope.core.Utils.get_dynamic_class_instantiation") as mock_get_class_instantiation:
|
|
|
NeuronLauncher.start_neuron(neuron=neuron)
|
|
|
|
|
|
mock_get_class_instantiation.assert_called_once_with(package_name="neurons",
|
|
|
- module_name=neuron.name.capitalize(),
|
|
|
+ module_name=neuron.name,
|
|
|
parameters=neuron.parameters,
|
|
|
- resources_dir='/var/tmp/test/resources')
|
|
|
+ resources_dir=sl.settings.resources.neuron_folder)
|
|
|
mock_get_class_instantiation.reset_mock()
|
|
|
|