[autotest] Make audio_AudioQualityAfterSuspend.py through servo_ConsoleStress.py Python3-compatible syntax-wise
BUG=chromium:990593
TEST=python3 -m py_compile audio_AudioQualityAfterSuspend.py
Change-Id: I4f302fcbfb8a4564bcbc4a51901b2eb47cebef17
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2299048
Reviewed-by: Gregory Nisbet <gregorynisbet@google.com>
Reviewed-by: Allen Li <ayatane@chromium.org>
Tested-by: Gregory Nisbet <gregorynisbet@google.com>
Commit-Queue: Gregory Nisbet <gregorynisbet@google.com>
diff --git a/server/site_tests/audio_AudioQualityAfterSuspend/audio_AudioQualityAfterSuspend.py b/server/site_tests/audio_AudioQualityAfterSuspend/audio_AudioQualityAfterSuspend.py
index 9b3c513..c2f258b 100644
--- a/server/site_tests/audio_AudioQualityAfterSuspend/audio_AudioQualityAfterSuspend.py
+++ b/server/site_tests/audio_AudioQualityAfterSuspend/audio_AudioQualityAfterSuspend.py
@@ -4,6 +4,8 @@
"""This is a server side audio test using the Chameleon board."""
+from __future__ import print_function
+
import logging
import os
import tempfile
@@ -52,7 +54,7 @@
os.path.basename(self.test_playback_file))
with tempfile.NamedTemporaryFile() as tmpfile:
file_utils.download_file(self.test_playback_file, tmpfile.name)
- os.chmod(tmpfile.name, 0444)
+ os.chmod(tmpfile.name, 0o0444)
self.host.send_file(tmpfile.name, host_file)
logging.debug('Copied the file on the DUT at %s', host_file)
diff --git a/server/site_tests/display_HotPlugAtSuspend/display_HotPlugAtSuspend.py b/server/site_tests/display_HotPlugAtSuspend/display_HotPlugAtSuspend.py
index c66e35b..e7cadf9 100644
--- a/server/site_tests/display_HotPlugAtSuspend/display_HotPlugAtSuspend.py
+++ b/server/site_tests/display_HotPlugAtSuspend/display_HotPlugAtSuspend.py
@@ -4,6 +4,8 @@
"""This is a display hot-plug and suspend test using the Chameleon board."""
+from __future__ import print_function
+
import logging
import time
@@ -92,7 +94,7 @@
logging.info('WAITING FOR SUSPEND...')
try:
host.test_wait_for_sleep(self.SUSPEND_TIMEOUT)
- except error.TestFail, ex:
+ except error.TestFail as ex:
errors.append("%s - %s" % (test_case, str(ex)))
if plugged_after_suspend is not plugged_before_suspend:
chameleon_port.set_plug(plugged_after_suspend)
@@ -111,7 +113,7 @@
logging.info('WAITING FOR RESUME...')
try:
host.test_wait_for_resume(boot_id, self.RESUME_TIMEOUT)
- except error.TestFail, ex:
+ except error.TestFail as ex:
errors.append("%s - %s" % (test_case, str(ex)))
logging.info('Resumed back')
diff --git a/server/site_tests/firmware_Cr50FactoryResetVC/firmware_Cr50FactoryResetVC.py b/server/site_tests/firmware_Cr50FactoryResetVC/firmware_Cr50FactoryResetVC.py
index af5480d..ae95f4f 100644
--- a/server/site_tests/firmware_Cr50FactoryResetVC/firmware_Cr50FactoryResetVC.py
+++ b/server/site_tests/firmware_Cr50FactoryResetVC/firmware_Cr50FactoryResetVC.py
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+from __future__ import print_function
+
import logging
import time
@@ -35,7 +37,7 @@
try:
self.bp_override(True)
self.bp_override(False)
- except Exception, e:
+ except Exception as e:
logging.info(e)
raise error.TestNAError('Cannot fully test factory mode vendor '
'command without the ability to fake battery presence')
@@ -196,7 +198,7 @@
try:
self.set_factory_mode(True)
self.set_factory_mode(False)
- except Exception, e:
+ except Exception as e:
message = 'FAILURE %r %r' % (self.get_state_message(),
e)
logging.info(message)
diff --git a/server/site_tests/firmware_Cr50Open/firmware_Cr50Open.py b/server/site_tests/firmware_Cr50Open/firmware_Cr50Open.py
index 566f59e..cb114e3 100644
--- a/server/site_tests/firmware_Cr50Open/firmware_Cr50Open.py
+++ b/server/site_tests/firmware_Cr50Open/firmware_Cr50Open.py
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+from __future__ import print_function
+
import logging
import time
@@ -48,7 +50,7 @@
#Make sure open doesn't work from the console.
try:
self.cr50.set_ccd_level('open')
- except error.TestFail, e:
+ except error.TestFail as e:
if not batt_pres:
raise error.TestFail('Unable to open cr50 from console with '
'batt disconnected: %s' % str(e))
@@ -76,7 +78,7 @@
#Make sure open only works from the AP when the device is in dev mode.
try:
self.ccd_open_from_ap()
- except error.TestFail, e:
+ except error.TestFail as e:
logging.info(e)
# ccd open should work if the device is in dev mode or ccd open
# isn't restricted. If open failed for some reason raise the error.
diff --git a/server/site_tests/servo_ConsoleStress/servo_ConsoleStress.py b/server/site_tests/servo_ConsoleStress/servo_ConsoleStress.py
index a5deb1e..732d5bc 100644
--- a/server/site_tests/servo_ConsoleStress/servo_ConsoleStress.py
+++ b/server/site_tests/servo_ConsoleStress/servo_ConsoleStress.py
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+from __future__ import print_function
+
import difflib
import logging
@@ -63,7 +65,7 @@
for i in range(attempts):
try:
output = self._get_test_cmd_output(cmd)
- except Exception, e:
+ except Exception as e:
raise error.TestFail('failed to get %s %r during run %d' %
(cmd_type, cmd, i))
