Merge branch 'master' into feature/deb-packaging

mycroft/skills/ip_skill/__init__.py

@@ -17,11 +17,15 @@
 
 
 from os.path import dirname, join
+import re
 
 from netifaces import interfaces, ifaddresses, AF_INET
 
 from adapt.intent import IntentBuilder
 from mycroft.skills.core import MycroftSkill
+from mycroft.util.log import getLogger
+
+logger = getLogger(__name__)
 
 __author__ = 'ryanleesipes'
 
@@ -42,8 +46,13 @@ class IPSkill(MycroftSkill):
             addresses = [
                 i['addr'] for i in
                 ifaddresses(ifaceName).setdefault(
-                    AF_INET, [{'addr': 'No IP addr'}])]
-            if ifaceName != "lo":
+                    AF_INET, [{'addr': None}])]
+            if None in addresses:
+                addresses.remove(None)
+            if addresses and ifaceName != "lo":
+                addresses = [re.sub(r"\.", r" dot ", address)
+                             for address in addresses]
+                logger.debug(addresses[0])
                 self.speak('%s: %s' % (
                     "interface: " + ifaceName +
                     ", I.P. Address ", ', '.join(addresses)))

start.sh

@@ -10,7 +10,7 @@ case $1 in
 	"cli") SCRIPT=${TOP}/mycroft/client/text/cli.py ;;
 	"audiotest") SCRIPT=${TOP}/mycroft/util/audio_test.py ;;
 	"collector") SCRIPT=${TOP}/mycroft_data_collection/cli.py ;;
-	"unittest") SCRIPT=${TOP}/test/__init__.py ;;
+	"unittest") SCRIPT=${TOP}/test/test_runner.py ;;
 	"sdkdoc") SCRIPT=${TOP}/doc/generate_sdk_docs.py ;;
         "enclosure") SCRIPT=${TOP}/mycroft/client/enclosure/enclosure.py ;;
         "pairing") SCRIPT=${TOP}/mycroft/pairing/client.py ;;

test/__init__.py

@@ -1,19 +0,0 @@
-import sys
-import unittest
-
-from os.path import dirname
-from xmlrunner import XMLTestRunner
-
-from mycroft.configuration import ConfigurationManager
-
-__author__ = 'seanfitz, jdorleans'
-
-fail_on_error = "--fail-on-error" in sys.argv
-ConfigurationManager.load_local(['mycroft.ini'])
-
-tests = unittest.TestLoader().discover(dirname(__file__), "*.py")
-runner = XMLTestRunner("./build/report/tests")
-result = runner.run(tests)
-
-if fail_on_error and len(result.failures + result.errors) > 0:
-    sys.exit(1)

test/test_runner.py

@@ -0,0 +1,19 @@
+import sys
+import unittest
+
+from os.path import dirname
+from xmlrunner import XMLTestRunner
+
+from mycroft.configuration import ConfigurationManager
+
+__author__ = 'seanfitz, jdorleans'
+if __name__ == "__main__":
+    fail_on_error = "--fail-on-error" in sys.argv
+    ConfigurationManager.load_local(['mycroft.ini'])
+
+    tests = unittest.TestLoader().discover(dirname(__file__), "*.py")
+    runner = XMLTestRunner("./build/report/tests")
+    result = runner.run(tests)
+
+    if fail_on_error and len(result.failures + result.errors) > 0:
+        sys.exit(1)