Browse Source

[Test] Remove obsolete singleton del in tests

monf 8 years ago
parent
commit
b93c18a525
2 changed files with 0 additions and 20 deletions
  1. 0 7
      Tests/test_brain_loader.py
  2. 0 13
      Tests/test_settings_loader.py

+ 0 - 7
Tests/test_brain_loader.py

@@ -36,7 +36,6 @@ class TestBrainLoader(unittest.TestCase):
         """
         brain_loader = BrainLoader(file_path=self.brain_to_test)
         self.assertEqual(brain_loader.yaml_config, self.expected_result)
-        del brain_loader
 
     def test_get_brain(self):
         """
@@ -61,7 +60,6 @@ class TestBrainLoader(unittest.TestCase):
 
         brain_loader = BrainLoader(file_path=self.brain_to_test)
         self.assertEqual(brain, brain_loader.brain)
-        del brain_loader
 
     def test_get_neurons(self):
         neuron_list = [{'say': {'message': ['test message']}}]
@@ -72,7 +70,6 @@ class TestBrainLoader(unittest.TestCase):
         neurons_from_brain_loader = bl._get_neurons(neuron_list)
 
         self.assertEqual([neuron], neurons_from_brain_loader)
-        del bl
 
     def test_get_signals(self):
         signals = [{'order': 'test_order'}]
@@ -83,7 +80,6 @@ class TestBrainLoader(unittest.TestCase):
         signals_from_brain_loader = bl._get_signals(signals)
 
         self.assertEqual([signal], signals_from_brain_loader)
-        del bl
 
     def test_get_event_or_order_from_dict(self):
 
@@ -99,15 +95,12 @@ class TestBrainLoader(unittest.TestCase):
 
         self.assertEqual(order_from_bl, order_object)
         self.assertEqual(event_from_bl, event_object)
-        del bl
 
     def test_singleton(self):
         bl1 = BrainLoader(file_path=self.brain_to_test)
         bl2 = BrainLoader(file_path=self.brain_to_test)
 
         self.assertTrue(bl1.brain is bl2.brain)
-        del bl1
-        del bl2
 
 if __name__ == '__main__':
     unittest.main()

+ 0 - 13
Tests/test_settings_loader.py

@@ -46,14 +46,11 @@ class TestSettingLoader(unittest.TestCase):
 
         self.assertTrue(s1.settings is s2.settings)
 
-        del s1
-        del s2
 
     def test_get_yaml_config(self):
 
         sl = SettingLoader(file_path=self.settings_file_to_test)
         self.assertEqual(sl.yaml_config, self.settings_dict)
-        del sl
 
     def test_get_settings(self):
         settings_object = Settings()
@@ -78,52 +75,44 @@ class TestSettingLoader(unittest.TestCase):
         sl = SettingLoader(file_path=self.settings_file_to_test)
 
         self.assertEqual(settings_object, sl.settings)
-        del sl
 
     def test_get_default_speech_to_text(self):
         expected_default_speech_to_text = "google"
         sl = SettingLoader(file_path=self.settings_file_to_test)
 
         self.assertEqual(expected_default_speech_to_text, sl._get_default_speech_to_text(self.settings_dict))
-        del sl
 
     def test_get_default_text_to_speech(self):
         expected_default_text_to_speech = "pico2wave"
         sl = SettingLoader(file_path=self.settings_file_to_test)
         self.assertEqual(expected_default_text_to_speech, sl._get_default_text_to_speech(self.settings_dict))
-        del sl
 
     def test_get_default_trigger(self):
         expected_default_trigger = "snowboy"
         sl = SettingLoader(file_path=self.settings_file_to_test)
         self.assertEqual(expected_default_trigger, sl._get_default_trigger(self.settings_dict))
-        del sl
 
     def test_get_stts(self):
         stt = Stt(name="google", parameters={'language': 'fr-FR'})
         sl = SettingLoader(file_path=self.settings_file_to_test)
         self.assertEqual([stt], sl._get_stts(self.settings_dict))
-        del sl
 
     def test_get_ttss(self):
         tts1 = Tts(name="pico2wave", parameters={'cache': True, 'language': 'fr-FR'})
         tts2 = Tts(name="voxygen", parameters={'voice': 'Agnes', 'cache': True})
         sl = SettingLoader(file_path=self.settings_file_to_test)
         self.assertEqual([tts1, tts2], sl._get_ttss(self.settings_dict))
-        del sl
 
     def test_get_triggers(self):
         trigger1 = Trigger(name="snowboy",
                            parameters={'pmdl_file': 'trigger/snowboy/resources/kalliope-FR-6samples.pmdl'})
         sl = SettingLoader(file_path=self.settings_file_to_test)
         self.assertEqual([trigger1], sl._get_triggers(self.settings_dict))
-        del sl
 
     def test_get_random_wake_up_answers(self):
         expected_random_wake_up_answers = ['Oui monsieur?']
         sl = SettingLoader(file_path=self.settings_file_to_test)
         self.assertEqual(expected_random_wake_up_answers, sl._get_random_wake_up_answers(self.settings_dict))
-        del sl
 
     def test_get_rest_api(self):
         expected_rest_api = RestAPI(password_protected=True, active=True,
@@ -131,13 +120,11 @@ class TestSettingLoader(unittest.TestCase):
 
         sl = SettingLoader(file_path=self.settings_file_to_test)
         self.assertEqual(expected_rest_api, sl._get_rest_api(self.settings_dict))
-        del sl
 
     def test_get_cache_path(self):
         expected_cache_path = '/tmp/kalliope_tts_cache'
         sl = SettingLoader(file_path=self.settings_file_to_test)
         self.assertEqual(expected_cache_path, sl._get_cache_path(self.settings_dict))
-        del sl
 
 if __name__ == '__main__':
     unittest.main()