Rebased to upstream

This commit is contained in:
NMA 2016-08-25 17:02:45 +05:30
commit 185ae50e24
2 changed files with 3 additions and 2 deletions

View file

@ -30,6 +30,7 @@ _LOGGER = logging.getLogger(__name__)
LOCK = threading.Lock() LOCK = threading.Lock()
CONF_MAX_GPS_ACCURACY = 'max_gps_accuracy' CONF_MAX_GPS_ACCURACY = 'max_gps_accuracy'
CONF_WAYPOINT_IMPORT_USER = 'waypoint_import_user'
VALIDATE_LOCATION = 'location' VALIDATE_LOCATION = 'location'
VALIDATE_TRANSITION = 'transition' VALIDATE_TRANSITION = 'transition'

View file

@ -562,6 +562,6 @@ class TestDeviceTrackerOwnTracks(unittest.TestCase):
self.send_message(WAYPOINT_TOPIC, waypoints_message) self.send_message(WAYPOINT_TOPIC, waypoints_message)
# Check if it made it into states # Check if it made it into states
wayp = self.hass.states.get('zone.exp_wayp1') wayp = self.hass.states.get('zone.exp_wayp1')
self.assertTrue(wayp != None) self.assertTrue(wayp is not None)
wayp = self.hass.states.get('zone.exp_wayp2') wayp = self.hass.states.get('zone.exp_wayp2')
self.assertTrue(wayp != None) self.assertTrue(wayp is not None)