commit 2a548d440d63b590b8bffc5464fb1480ee8041cd
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 26 00:14:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 26 00:14:09 2017 +0000
tree 4fe5ba74f31196524a67ee1140245f7d9b30786c
parent 1cd3badbef412cff5b800bb9b06c3043b3f59176
parent f04689102ee2450bcdb30cb8561dac00739e170c

Merge "Fix syntax error in Vehicle VTS"

vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py

diff --git a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py
index 8024be2..8d786e7 100644
--- a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py
+++ b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py
@@ -158,11 +158,11 @@
         assertEqual(1, len(propValue.value.int32Values))
         drivingStatus = propValue.value.int32Values[0]
 
-        allStatuses = self.vtypes.UNRESTRICTED or self.vtypes.NO_VIDEO or
-            self.vtypes.NO_KEYBOARD_INPUT or self.vtypes.NO_VOICE_INPUT or
-            self.vtypes.NO_CONFIG or self.vtypes.LIMIT_MESSAGE_LEN
+        allStatuses = (self.vtypes.UNRESTRICTED | self.vtypes.NO_VIDEO
+               | self.vtypes.NO_KEYBOARD_INPUT | self.vtypes.NO_VOICE_INPUT
+               | self.vtypes.NO_CONFIG | self.vtypes.LIMIT_MESSAGE_LEN)
 
-        assertEqual(allStatuses, allStatuses or drivingStatus)
+        assertEqual(allStatuses, allStatuses | drivingStatus)
 
 if __name__ == "__main__":
     test_runner.main()