Merge pull request #407 from balloob/testing-upgrade

Fix CI

.gitignore

@@ -15,10 +15,6 @@ tests/config/home-assistant.log
 *.sublime-project
 *.sublime-workspace
 
-# Hide code validator output
-pep8.txt
-pylint.txt
-
 # Hide some OS X stuff
 .DS_Store
 .AppleDouble
@@ -30,6 +26,9 @@ Icon
 
 .idea
 
+# pytest
+.cache
+
 # GITHUB Proposed Python stuff:
 *.py[cod]
 

homeassistant/components/automation/time.py

@@ -79,11 +79,11 @@ def if_action(hass, config):
         now = dt_util.now()
         if before is not None and now > now.replace(hour=before.hour,
                                                     minute=before.minute):
-                return False
+            return False
 
         if after is not None and now < now.replace(hour=after.hour,
                                                    minute=after.minute):
-                return False
+            return False
 
         if weekday is not None:
             now_weekday = WEEKDAYS[now.weekday()]

homeassistant/components/frontend/www_static/home-assistant-polymer

@@ -1 +1 @@
-Subproject commit 63e039a221ae6771e0d7c6990d9a93b7cc22fc64
+Subproject commit 68f6c6ae5d37a1f0fcd1c36a8803581f9367ac5f

homeassistant/components/logbook.py

@@ -134,6 +134,9 @@ def humanify(events):
             if event.event_type == EVENT_STATE_CHANGED:
                 entity_id = event.data['entity_id']
 
+                if entity_id is None:
+                    continue
+
                 if entity_id.startswith('sensor.'):
                     last_sensor_event[entity_id] = event
 

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+testpaths = tests

script/cibuild

@@ -4,4 +4,9 @@
 #                 designed to run on the continuous integration server.
 
 script/test coverage
+
+STATUS=$?
+
 coveralls
+
+exit $STATUS

script/lint

@@ -3,7 +3,16 @@
 cd "$(dirname "$0")/.."
 
 echo "Checking style with flake8..."
-flake8 homeassistant
+flake8 --exclude www_static homeassistant
+
+STATUS=$?
 
 echo "Checking style with pylint..."
 pylint homeassistant
+
+if [ $STATUS -eq 0 ]
+then
+  exit $?
+else
+  exit $STATUS
+fi

script/test

@@ -7,10 +7,19 @@ cd "$(dirname "$0")/.."
 
 script/lint
 
+STATUS=$?
+
 echo "Running tests..."
 
 if [ "$1" = "coverage" ]; then
-  py.test --cov homeassistant tests
+  py.test --cov --cov-report=
 else
-  py.test tests
+  py.test
+fi
+
+if [ $STATUS -eq 0 ]
+then
+  exit $?
+else
+  exit $STATUS
 fi