Added test for vocabcompiler to --light tests and updated travis co…

…nfig

.travis.yml

@@ -5,4 +5,4 @@ env:
 
 script:
     - "pip install -r client/requirements.txt"
-    - "cd client && python test.py --light --vocabcompiler"
+    - "cd client && python test.py --light"

client/test.py

@@ -233,13 +233,9 @@ def testPriority(self):
         description='Test suite for the Jasper client code.')
     parser.add_argument('--light', action='store_true',
                         help='runs a subset of the tests (only requires Python dependencies)')
-    parser.add_argument('--vocabcompiler', action='store_true',
-                        help='runs the vocabcompiler test (independently of the --light argument)')
     args = parser.parse_args()
 
-    test_cases = [TestBrain, TestModules]
-    if args.vocabcompiler:
-        test_cases.append(TestVocabCompiler)
+    test_cases = [TestBrain, TestModules, TestVocabCompiler]
     if not args.light:
         test_cases.append(TestG2P)
         test_cases.append(TestMic)

jasper.py

@@ -7,6 +7,7 @@
 import shutil
 import yaml
 
+from diagnose import Diagnostics
 from client import vocabcompiler, stt
 from client import speaker as speak
 from client.conversation import Conversation
@@ -45,11 +46,9 @@
 speaker = speak.newSpeaker()
 
 def testConnection():
-    try:
-        urllib2.urlopen("http://www.google.com").getcode()
+    if Diagnostics.check_network_connection():
         print "CONNECTED TO INTERNET"
-
-    except urllib2.URLError:
+    else:
         print "COULD NOT CONNECT TO NETWORK"
         speaker.say(
             "Warning: I was unable to connect to a network. Parts of the system may not work correctly, depending on your setup.")