summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2014-09-26 13:44:08 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2014-09-26 13:44:08 +0200
commit37aaa490c8325275144a4d683234ce226f2caa21 (patch)
tree422a26956103b8ac1fce0adae85abd3584ee4c12 /client
parentf3496efac9f13d22a7fe725a3807a6bc8a2d889d (diff)
downloadjasper-client-37aaa490c8325275144a4d683234ce226f2caa21.tar.gz
jasper-client-37aaa490c8325275144a4d683234ce226f2caa21.zip
Remove useless activeInternet wrapper func
Diffstat (limited to 'client')
-rw-r--r--client/test.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/client/test.py b/client/test.py
index 0ad37a3..21f3a94 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