diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2014-09-26 16:59:03 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2014-09-26 16:59:03 +0200 |
| commit | 9c99faa2a5b25eba9fbb27e344afab3d9f6f12b0 (patch) | |
| tree | 3d7b98f8c78fec37c7a47d0800bfcf0a522c003a | |
| parent | cb0eb4742347c7d8c692342bc4c0e37a95ffaa51 (diff) | |
| parent | 37aaa490c8325275144a4d683234ce226f2caa21 (diff) | |
| download | jasper-client-9c99faa2a5b25eba9fbb27e344afab3d9f6f12b0.tar.gz jasper-client-9c99faa2a5b25eba9fbb27e344afab3d9f6f12b0.zip | |
Merge pull request #200 from Holzhaus/remove-useless-wrapper-func
Remove useless activeInternet wrapper func
| -rw-r--r-- | client/test.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/client/test.py b/client/test.py index 9bd765d..ae6b594 100644 --- a/client/test.py +++ b/client/test.py @@ -21,9 +21,6 @@ DEFAULT_PROFILE = { 'phone_number': '012344321' } -def activeInternet(): - return Diagnostics.check_network_connection() - class UnorderedList(list): def __eq__(self, other): @@ -145,7 +142,7 @@ class TestModules(unittest.TestCase): inputs = [] self.runConversation(query, inputs, Time) - @unittest.skipIf(not activeInternet(), "No internet connection") + @unittest.skipIf(not Diagnostics.check_network_connection(), "No internet connection") def testGmail(self): key = 'gmail_password' if not key in self.profile or not self.profile[key]: @@ -157,7 +154,7 @@ class TestModules(unittest.TestCase): inputs = [] self.runConversation(query, inputs, Gmail) - @unittest.skipIf(not activeInternet(), "No internet connection") + @unittest.skipIf(not Diagnostics.check_network_connection(), "No internet connection") def testHN(self): from modules import HN @@ -169,7 +166,7 @@ class TestModules(unittest.TestCase): outputs = self.runConversation(query, inputs, HN) self.assertTrue("front-page articles" in outputs[1]) - @unittest.skipIf(not activeInternet(), "No internet connection") + @unittest.skipIf(not Diagnostics.check_network_connection(), "No internet connection") def testNews(self): from modules import News @@ -181,7 +178,7 @@ class TestModules(unittest.TestCase): outputs = self.runConversation(query, inputs, News) self.assertTrue("top headlines" in outputs[1]) - @unittest.skipIf(not activeInternet(), "No internet connection") + @unittest.skipIf(not Diagnostics.check_network_connection(), "No internet connection") def testWeather(self): from modules import Weather |