MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix failing tests. 

core.py: replace zip with list comprehension
test_parse_fr.py: remove superfluous "0":s
pull/1568/head
Åke Forslund 2018-05-02 09:03:58 +02:00
parent 5d50d22061
commit 1d0844f2c4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/unittests/skills/core.py
View File

@ -424,7 +424,7 @@ class MycroftSkillTest(unittest.TestCase):
# Check that the handler was registered with the emitter
self.assertEqual(emitter.on.call_args[0][0], 'handler1')
# Check that the handler was stored in the skill
self.assertTrue('handler1' in zip(*s.events)[0])
self.assertTrue('handler1' in [e[0] for e in s.events])
@mock.patch.dict(Configuration._Configuration__config, BASE_CONF)
def test_remove_event(self):
@ -432,11 +432,11 @@ class MycroftSkillTest(unittest.TestCase):
s = SimpleSkill1()
s.bind(emitter)
s.add_event('handler1', s.handler)
self.assertTrue('handler1' in zip(*s.events)[0])
self.assertTrue('handler1' in [e[0] for e in s.events])
# Remove event handler
s.remove_event('handler1')
# make sure it's not in the event list anymore
self.assertTrue('handler1' not in zip(*s.events)[0])
self.assertTrue('handler1' not in [e[0] for e in s.events])
# Check that the handler was registered with the emitter
self.assertEqual(emitter.remove.call_args[0][0], 'handler1')
@ -448,7 +448,7 @@ class MycroftSkillTest(unittest.TestCase):
s.schedule_event(s.handler, datetime.now(), name='sched_handler1')
# Check that the handler was registered with the emitter
self.assertEqual(emitter.once.call_args[0][0], '0:sched_handler1')
self.assertTrue('0:sched_handler1' in zip(*s.events)[0])
self.assertTrue('0:sched_handler1' in [e[0] for e in s.events])
@mock.patch.dict(Configuration._Configuration__config, BASE_CONF)
def test_remove_scheduled_event(self):
@ -457,11 +457,11 @@ class MycroftSkillTest(unittest.TestCase):
s.bind(emitter)
s.schedule_event(s.handler, datetime.now(), name='sched_handler1')
# Check that the handler was registered with the emitter
self.assertTrue('0:sched_handler1' in zip(*s.events)[0])
self.assertTrue('0:sched_handler1' in [e[0] for e in s.events])
s.cancel_scheduled_event('sched_handler1')
# Check that the handler was removed
self.assertEqual(emitter.remove.call_args[0][0], '0:sched_handler1')
self.assertTrue('0:sched_handler1' not in zip(*s.events)[0])
self.assertTrue('0:sched_handler1' not in [e[0] for e in s.events])
@mock.patch.dict(Configuration._Configuration__config, BASE_CONF)
def test_run_scheduled_event(self):
@ -477,7 +477,7 @@ class MycroftSkillTest(unittest.TestCase):
self.assertTrue(s.handler_run)
# Check that the handler was removed from the list of registred
# handler
self.assertTrue('0:sched_handler1' not in zip(*s.events)[0])
self.assertTrue('0:sched_handler1' not in [e[0] for e in s.events])
class SimpleSkill1(MycroftSkill):

4
test/unittests/util/test_parse_fr.py
View File

@ -86,7 +86,7 @@ class TestNormalize_fr(unittest.TestCase):
def test_extractdatetime_fr(self):
def extractWithFormat_fr(text):
date = datetime(2017, 06, 27, 00, 00)
date = datetime(2017, 6, 27, 0, 0)
[extractedDate, leftover] = extract_datetime(text, date,
lang="fr-fr")
extractedDate = extractedDate.strftime("%Y-%m-%d %H:%M:%S")
@ -98,7 +98,7 @@ class TestNormalize_fr(unittest.TestCase):
self.assertEqual(res[1], expected_leftover)
def extractWithFormatDate2_fr(text):
date = datetime(2017, 06, 30, 17, 00)
date = datetime(2017, 6, 30, 17, 0)
[extractedDate, leftover] = extract_datetime(text, date,
lang="fr-fr")
extractedDate = extractedDate.strftime("%Y-%m-%d %H:%M:%S")