From 7dc4f3022d1843063dce621ca09c80bb64cdb8c1 Mon Sep 17 00:00:00 2001 From: schneefux Date: Wed, 1 Oct 2014 18:48:09 +0200 Subject: Improve diagnose.py reusability --- client/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'client/test.py') diff --git a/client/test.py b/client/test.py index d9ca8f5..d774eb7 100644 --- a/client/test.py +++ b/client/test.py @@ -13,8 +13,8 @@ import g2p import brain import jasperpath import tts +import diagnose from stt import TranscriptionMode -from diagnose import Diagnostics DEFAULT_PROFILE = { 'prefers_email': False, @@ -154,7 +154,7 @@ class TestModules(unittest.TestCase): inputs = [] self.runConversation(query, inputs, Time) - @unittest.skipIf(not Diagnostics.check_network_connection(), + @unittest.skipIf(not diagnose.check_network_connection(), "No internet connection") def testGmail(self): key = 'gmail_password' @@ -167,7 +167,7 @@ class TestModules(unittest.TestCase): inputs = [] self.runConversation(query, inputs, Gmail) - @unittest.skipIf(not Diagnostics.check_network_connection(), + @unittest.skipIf(not diagnose.check_network_connection(), "No internet connection") def testHN(self): from modules import HN @@ -180,7 +180,7 @@ class TestModules(unittest.TestCase): outputs = self.runConversation(query, inputs, HN) self.assertTrue("front-page articles" in outputs[1]) - @unittest.skipIf(not Diagnostics.check_network_connection(), + @unittest.skipIf(not diagnose.check_network_connection(), "No internet connection") def testNews(self): from modules import News @@ -193,7 +193,7 @@ class TestModules(unittest.TestCase): outputs = self.runConversation(query, inputs, News) self.assertTrue("top headlines" in outputs[1]) - @unittest.skipIf(not Diagnostics.check_network_connection(), + @unittest.skipIf(not diagnose.check_network_connection(), "No internet connection") def testWeather(self): from modules import Weather -- cgit v1.3.1 From 68704f36d7c05e06ffdf65e2593aa296ffd3a64d Mon Sep 17 00:00:00 2001 From: schneefux Date: Mon, 6 Oct 2014 18:41:50 +0200 Subject: Add testcase for diagnose.py's python import check --- client/test.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'client/test.py') diff --git a/client/test.py b/client/test.py index d774eb7..6858700 100644 --- a/client/test.py +++ b/client/test.py @@ -107,6 +107,14 @@ class TestG2P(unittest.TestCase): self.assertEqual(g2p.translateWords(words), translations) +class TestDiagnose(unittest.TestCase): + def testPythonImportCheck(self): + # This a python stdlib module that definitely exists + self.assertTrue(diagnose.check_python_import("os")) + # I sincerly hope nobody will ever create a package with that name + self.assertFalse(diagnose.check_python_import("nonexistant_package")) + + class TestModules(unittest.TestCase): def setUp(self): @@ -267,7 +275,8 @@ if __name__ == '__main__': # Change CWD to jasperpath.LIB_PATH os.chdir(jasperpath.LIB_PATH) - test_cases = [TestBrain, TestModules, TestVocabCompiler, TestTTS] + test_cases = [TestBrain, TestModules, TestVocabCompiler, TestTTS, + TestDiagnose] if not args.light: test_cases.append(TestG2P) test_cases.append(TestMic) -- cgit v1.3.1