autotest: move constants to common_lib
This file gets imported from lots of server-side tests and
infrastructure so it shouldn't be hiding in client/cros. This
moves the file and fixes all imports.
BUG=chromium:485834
TEST=run many tests, make sure there are no problems importing
constants
Change-Id: I5c2b2a0bef6ebc998e62f40162a6ec9cc4436480
Reviewed-on: https://chromium-review.googlesource.com/291302
Trybot-Ready: Eric Caruso <ejcaruso@chromium.org>
Commit-Queue: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Chris Sosa <sosa@google.com>
diff --git a/client/bin/base_sysinfo.py b/client/bin/base_sysinfo.py
index 27b6755..3371128 100644
--- a/client/bin/base_sysinfo.py
+++ b/client/bin/base_sysinfo.py
@@ -1,7 +1,7 @@
import os, shutil, re, glob, subprocess, logging
from autotest_lib.client.common_lib import log
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.bin import utils, package
diff --git a/client/bin/site_sysinfo.py b/client/bin/site_sysinfo.py
index 7144f8d..634d8e6 100755
--- a/client/bin/site_sysinfo.py
+++ b/client/bin/site_sysinfo.py
@@ -7,8 +7,9 @@
from autotest_lib.client.common_lib import log
from autotest_lib.client.common_lib import error, utils, global_config
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.bin import base_sysinfo
-from autotest_lib.client.cros import constants, tpm_dam
+from autotest_lib.client.cros import tpm_dam
get_value = global_config.global_config.get_config_value
collect_corefiles = get_value('CLIENT', 'collect_corefiles',
diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index e6315c6..8f09dd1 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -4,7 +4,7 @@
import logging, os
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.bin import utils
from telemetry.core import cros_interface, exceptions, util
from telemetry.internal.browser import browser_finder, browser_options
diff --git a/client/cros/constants.py b/client/common_lib/cros/constants.py
similarity index 100%
rename from client/cros/constants.py
rename to client/common_lib/cros/constants.py
diff --git a/client/common_lib/cros/interactive_xmlrpc_server.py b/client/common_lib/cros/interactive_xmlrpc_server.py
index 4ca846d..9173d9b 100755
--- a/client/common_lib/cros/interactive_xmlrpc_server.py
+++ b/client/common_lib/cros/interactive_xmlrpc_server.py
@@ -13,8 +13,9 @@
import common
from autotest_lib.client.bin import utils
-from autotest_lib.client.common_lib.cros import chrome, xmlrpc_server
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import chrome
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.common_lib.cros import xmlrpc_server
class InteractiveXmlRpcDelegate(xmlrpc_server.XmlRpcDelegate):
diff --git a/client/common_lib/cros/session_manager.py b/client/common_lib/cros/session_manager.py
index 857c570..8a1b26b 100644
--- a/client/common_lib/cros/session_manager.py
+++ b/client/common_lib/cros/session_manager.py
@@ -5,7 +5,7 @@
import dbus
from autotest_lib.client.bin import utils
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
def connect(bus_loop):
"""Create and return a DBus connection to session_manager.
diff --git a/client/common_lib/lsbrelease_utils.py b/client/common_lib/lsbrelease_utils.py
index c5cf624..ec15774 100644
--- a/client/common_lib/lsbrelease_utils.py
+++ b/client/common_lib/lsbrelease_utils.py
@@ -10,7 +10,7 @@
import re
import common
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
def _lsbrelease_search(regex, group_id=0, lsb_release_content=None):
diff --git a/client/common_lib/site_utils.py b/client/common_lib/site_utils.py
index a688395..47904e7 100644
--- a/client/common_lib/site_utils.py
+++ b/client/common_lib/site_utils.py
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib import global_config
from autotest_lib.client.common_lib import lsbrelease_utils
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
# Keep checking if the pid is alive every second until the timeout (in seconds)
diff --git a/client/cros/bluetooth/bluetooth_device_xmlrpc_server.py b/client/cros/bluetooth/bluetooth_device_xmlrpc_server.py
index c31db46..4330923 100755
--- a/client/cros/bluetooth/bluetooth_device_xmlrpc_server.py
+++ b/client/cros/bluetooth/bluetooth_device_xmlrpc_server.py
@@ -16,8 +16,8 @@
import common
from autotest_lib.client.bin import utils
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.common_lib.cros.bluetooth import bluetooth_socket
-from autotest_lib.client.cros import constants
from autotest_lib.client.cros import xmlrpc_server
diff --git a/client/cros/bluetooth/bluetooth_tester_xmlrpc_server.py b/client/cros/bluetooth/bluetooth_tester_xmlrpc_server.py
index b11479f..f3e9b4c 100755
--- a/client/cros/bluetooth/bluetooth_tester_xmlrpc_server.py
+++ b/client/cros/bluetooth/bluetooth_tester_xmlrpc_server.py
@@ -10,9 +10,9 @@
import logging.handlers
import common
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.common_lib.cros.bluetooth import bluetooth_sdp_socket
from autotest_lib.client.common_lib.cros.bluetooth import bluetooth_socket
-from autotest_lib.client.cros import constants
from autotest_lib.client.cros import xmlrpc_server
diff --git a/client/cros/chrome_binary_test.py b/client/cros/chrome_binary_test.py
index ac81238..18866f5 100755
--- a/client/cros/chrome_binary_test.py
+++ b/client/cros/chrome_binary_test.py
@@ -6,7 +6,7 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.cros.graphics import graphics_utils
diff --git a/client/cros/crash_test.py b/client/cros/crash_test.py
index 38c40fa..07717bd 100644
--- a/client/cros/crash_test.py
+++ b/client/cros/crash_test.py
@@ -4,9 +4,10 @@
import contextlib, fcntl, logging, os, re, shutil
-import common, constants, cros_logging
+import common, cros_logging
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
+from autotest_lib.client.common_lib.cros import constants
class CrashTest(test.test):
diff --git a/client/cros/cros_logging.py b/client/cros/cros_logging.py
index 3056c02..649c70e 100644
--- a/client/cros/cros_logging.py
+++ b/client/cros/cros_logging.py
@@ -7,7 +7,7 @@
import common
from autotest_lib.client.bin import utils
from autotest_lib.client.common_lib import error
-from constants import CLEANUP_LOGS_PAUSED_FILE
+from autotest_lib.client.common_lib.cros.constants import CLEANUP_LOGS_PAUSED_FILE
def strip_timestamp(msg):
diff --git a/client/cros/cros_ui.py b/client/cros/cros_ui.py
index 56decdb..6a52787 100644
--- a/client/cros/cros_ui.py
+++ b/client/cros/cros_ui.py
@@ -6,7 +6,7 @@
from autotest_lib.client.bin import utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
# Log messages used to signal when we're restarting UI. Used to detect
# crashes by cros_ui_test.UITest.
diff --git a/client/cros/cryptohome.py b/client/cros/cryptohome.py
index a0c6734..8a6b567 100644
--- a/client/cros/cryptohome.py
+++ b/client/cros/cryptohome.py
@@ -5,9 +5,10 @@
import dbus, gobject, logging, os, random, re, shutil, string
from dbus.mainloop.glib import DBusGMainLoop
-import common, constants
+import common
from autotest_lib.client.bin import utils
from autotest_lib.client.common_lib import error
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.cros.cros_disks import DBusClient
CRYPTOHOME_CMD = '/usr/sbin/cryptohome'
diff --git a/client/cros/dns_server.py b/client/cros/dns_server.py
index 57571cb..ece6be5 100644
--- a/client/cros/dns_server.py
+++ b/client/cros/dns_server.py
@@ -2,10 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import common, constants, logging, os, socket, stat, sys, threading, time
+import common, logging, os, socket, stat, sys, threading, time
from autotest_lib.client.bin import utils
from autotest_lib.client.common_lib import error
+from autotest_lib.client.common_lib.cros import constants
class LocalDns(object):
"""A wrapper around miniFakeDns that runs the server in a separate thread
diff --git a/client/cros/flimflam_test_path.py b/client/cros/flimflam_test_path.py
index a81b9aa..e076927 100644
--- a/client/cros/flimflam_test_path.py
+++ b/client/cros/flimflam_test_path.py
@@ -4,7 +4,7 @@
import os, sys
-import constants
+from autotest_lib.client.common_lib.cros import constants
sys.path.append(os.environ.get("SYSROOT", "/usr/local/") +
constants.FLIMFLAM_TEST_PATH)
diff --git a/client/cros/login.py b/client/cros/login.py
index 9637c5d..057dea4 100644
--- a/client/cros/login.py
+++ b/client/cros/login.py
@@ -4,9 +4,10 @@
import logging, os
-import constants, cros_logging, cros_ui, cryptohome
+import cros_logging, cros_ui, cryptohome
from autotest_lib.client.bin import utils
from autotest_lib.client.common_lib import error
+from autotest_lib.client.common_lib.cros import constants
class CrashError(error.TestError):
diff --git a/client/cros/multimedia/display_facade_native.py b/client/cros/multimedia/display_facade_native.py
index 74bd99a..9866d53 100644
--- a/client/cros/multimedia/display_facade_native.py
+++ b/client/cros/multimedia/display_facade_native.py
@@ -12,8 +12,10 @@
import time
from autotest_lib.client.bin import utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib.cros import chrome, retry
-from autotest_lib.client.cros import constants, sys_power
+from autotest_lib.client.common_lib.cros import chrome
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.common_lib.cros import retry
+from autotest_lib.client.cros import sys_power
from autotest_lib.client.cros.graphics import graphics_utils
from autotest_lib.client.cros.multimedia import image_generator
diff --git a/client/cros/multimedia/multimedia_xmlrpc_server.py b/client/cros/multimedia/multimedia_xmlrpc_server.py
index 70ef626..25bde07 100755
--- a/client/cros/multimedia/multimedia_xmlrpc_server.py
+++ b/client/cros/multimedia/multimedia_xmlrpc_server.py
@@ -12,8 +12,9 @@
import traceback
import common # pylint: disable=unused-import
from autotest_lib.client.bin import utils
-from autotest_lib.client.common_lib.cros import chrome, xmlrpc_server
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import chrome
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.common_lib.cros import xmlrpc_server
from autotest_lib.client.cros.multimedia import audio_facade_native
from autotest_lib.client.cros.multimedia import display_facade_native
diff --git a/client/cros/networking/apmanager_xmlrpc_server.py b/client/cros/networking/apmanager_xmlrpc_server.py
index 4e5dfb7..c49adb1 100755
--- a/client/cros/networking/apmanager_xmlrpc_server.py
+++ b/client/cros/networking/apmanager_xmlrpc_server.py
@@ -9,7 +9,7 @@
import common
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.cros import xmlrpc_server
from autotest_lib.client.cros.networking import apmanager_proxy
diff --git a/client/cros/networking/shill_xmlrpc_server.py b/client/cros/networking/shill_xmlrpc_server.py
index 415b38b..b64fe05 100755
--- a/client/cros/networking/shill_xmlrpc_server.py
+++ b/client/cros/networking/shill_xmlrpc_server.py
@@ -11,9 +11,9 @@
import common
from autotest_lib.client.common_lib import utils
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.cros import xmlrpc_server
-from autotest_lib.client.cros import constants
from autotest_lib.client.cros import cros_ui
from autotest_lib.client.cros import sys_power
from autotest_lib.client.cros import tpm_store
diff --git a/client/cros/ownership.py b/client/cros/ownership.py
index cc4c41a..6a6f0cf 100644
--- a/client/cros/ownership.py
+++ b/client/cros/ownership.py
@@ -4,9 +4,10 @@
import logging, os, shutil, tempfile
-import common, constants, cryptohome
+import common, cryptohome
from autotest_lib.client.bin import utils
from autotest_lib.client.common_lib import autotemp, error
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.cros import cros_ui
diff --git a/client/site_tests/desktopui_CrashyReboot/desktopui_CrashyReboot.py b/client/site_tests/desktopui_CrashyReboot/desktopui_CrashyReboot.py
index c4b27e7..e382b6a 100644
--- a/client/site_tests/desktopui_CrashyReboot/desktopui_CrashyReboot.py
+++ b/client/site_tests/desktopui_CrashyReboot/desktopui_CrashyReboot.py
@@ -5,7 +5,8 @@
import logging
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants, cros_ui
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import cros_ui
class UIStopped(Exception):
diff --git a/client/site_tests/desktopui_ExitOnSupervisedUserCrash/desktopui_ExitOnSupervisedUserCrash.py b/client/site_tests/desktopui_ExitOnSupervisedUserCrash/desktopui_ExitOnSupervisedUserCrash.py
index fae170d..cb6e96e 100644
--- a/client/site_tests/desktopui_ExitOnSupervisedUserCrash/desktopui_ExitOnSupervisedUserCrash.py
+++ b/client/site_tests/desktopui_ExitOnSupervisedUserCrash/desktopui_ExitOnSupervisedUserCrash.py
@@ -9,7 +9,7 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib.cros import chrome, session_manager
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
class desktopui_ExitOnSupervisedUserCrash(test.test):
diff --git a/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py b/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py
index e7c05b8..1286449 100755
--- a/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py
+++ b/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py
@@ -7,7 +7,8 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib.cros import chrome
-from autotest_lib.client.cros import constants, cros_logging
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import cros_logging
from autotest_lib.client.cros import httpd
diff --git a/client/site_tests/desktopui_GmailLatency/desktopui_GmailLatency.py b/client/site_tests/desktopui_GmailLatency/desktopui_GmailLatency.py
index 356b0d2..8d00869 100644
--- a/client/site_tests/desktopui_GmailLatency/desktopui_GmailLatency.py
+++ b/client/site_tests/desktopui_GmailLatency/desktopui_GmailLatency.py
@@ -5,7 +5,8 @@
import logging, os, time, utils
from autotest_lib.client.bin import test
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants, cros_ui
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import cros_ui
from autotest_lib.client.cros.graphics import graphics_utils
class desktopui_GmailLatency(test.test):
diff --git a/client/site_tests/desktopui_HangDetector/desktopui_HangDetector.py b/client/site_tests/desktopui_HangDetector/desktopui_HangDetector.py
index bac7368..70ab062 100644
--- a/client/site_tests/desktopui_HangDetector/desktopui_HangDetector.py
+++ b/client/site_tests/desktopui_HangDetector/desktopui_HangDetector.py
@@ -7,7 +7,8 @@
import common
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants, cros_logging, cros_ui, login
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import cros_logging, cros_ui, login
class desktopui_HangDetector(test.test):
"""
diff --git a/client/site_tests/desktopui_Respawn/desktopui_Respawn.py b/client/site_tests/desktopui_Respawn/desktopui_Respawn.py
index dda8407..21ad2e5 100644
--- a/client/site_tests/desktopui_Respawn/desktopui_Respawn.py
+++ b/client/site_tests/desktopui_Respawn/desktopui_Respawn.py
@@ -5,7 +5,8 @@
import logging, os, time
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants, cros_ui
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import cros_ui
class desktopui_Respawn(test.test):
"""Validate that the UI will cease respawning after a certain number of
diff --git a/client/site_tests/display_ClientChameleonConnection/display_ClientChameleonConnection.py b/client/site_tests/display_ClientChameleonConnection/display_ClientChameleonConnection.py
index b669f80..ae6558d 100755
--- a/client/site_tests/display_ClientChameleonConnection/display_ClientChameleonConnection.py
+++ b/client/site_tests/display_ClientChameleonConnection/display_ClientChameleonConnection.py
@@ -9,7 +9,7 @@
from autotest_lib.client.bin import test
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib.cros import chrome
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
from autotest_lib.client.cros.chameleon import chameleon
from autotest_lib.client.cros.chameleon import chameleon_port_finder
from autotest_lib.client.cros.multimedia import local_facade_factory
diff --git a/client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py b/client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py
index 6a97fd3..52d45d9 100644
--- a/client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py
+++ b/client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py
@@ -7,7 +7,8 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib.cros import chrome
-from autotest_lib.client.cros import constants, httpd
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import httpd
def _respond_with_cookies(handler, url_args):
diff --git a/client/site_tests/login_GuestAndActualSession/login_GuestAndActualSession.py b/client/site_tests/login_GuestAndActualSession/login_GuestAndActualSession.py
index 8f55eaf..7defb3b 100644
--- a/client/site_tests/login_GuestAndActualSession/login_GuestAndActualSession.py
+++ b/client/site_tests/login_GuestAndActualSession/login_GuestAndActualSession.py
@@ -8,8 +8,10 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib.cros import policy, session_manager
-from autotest_lib.client.cros import constants, cros_ui, cryptohome, ownership
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.common_lib.cros import policy
+from autotest_lib.client.common_lib.cros import session_manager
+from autotest_lib.client.cros import cros_ui, cryptohome, ownership
class login_GuestAndActualSession(test.test):
diff --git a/client/site_tests/login_OwnershipNotRetaken/login_OwnershipNotRetaken.py b/client/site_tests/login_OwnershipNotRetaken/login_OwnershipNotRetaken.py
index e5ec7da..ae237f0 100644
--- a/client/site_tests/login_OwnershipNotRetaken/login_OwnershipNotRetaken.py
+++ b/client/site_tests/login_OwnershipNotRetaken/login_OwnershipNotRetaken.py
@@ -7,8 +7,10 @@
from autotest_lib.client.bin import test
from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib.cros import chrome, session_manager
-from autotest_lib.client.cros import constants, cryptohome, ownership
+from autotest_lib.client.common_lib.cros import chrome
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.common_lib.cros import session_manager
+from autotest_lib.client.cros import cryptohome, ownership
class login_OwnershipNotRetaken(test.test):
diff --git a/client/site_tests/login_OwnershipRetaken/login_OwnershipRetaken.py b/client/site_tests/login_OwnershipRetaken/login_OwnershipRetaken.py
index 6f28243..0f9eb24 100644
--- a/client/site_tests/login_OwnershipRetaken/login_OwnershipRetaken.py
+++ b/client/site_tests/login_OwnershipRetaken/login_OwnershipRetaken.py
@@ -7,8 +7,10 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib.cros import policy, session_manager
-from autotest_lib.client.cros import constants, cros_ui, cryptohome, ownership
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.common_lib.cros import policy
+from autotest_lib.client.common_lib.cros import session_manager
+from autotest_lib.client.cros import cros_ui, cryptohome, ownership
class login_OwnershipRetaken(test.test):
diff --git a/client/site_tests/login_OwnershipTaken/login_OwnershipTaken.py b/client/site_tests/login_OwnershipTaken/login_OwnershipTaken.py
index a7eff12..fb60208 100644
--- a/client/site_tests/login_OwnershipTaken/login_OwnershipTaken.py
+++ b/client/site_tests/login_OwnershipTaken/login_OwnershipTaken.py
@@ -7,8 +7,10 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib.cros import chrome, session_manager
-from autotest_lib.client.cros import constants, ownership
+from autotest_lib.client.common_lib.cros import chrome
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.common_lib.cros import session_manager
+from autotest_lib.client.cros import ownership
class login_OwnershipTaken(test.test):
diff --git a/client/site_tests/platform_CryptohomeChangePassword/platform_CryptohomeChangePassword.py b/client/site_tests/platform_CryptohomeChangePassword/platform_CryptohomeChangePassword.py
index 3330078..b822429 100644
--- a/client/site_tests/platform_CryptohomeChangePassword/platform_CryptohomeChangePassword.py
+++ b/client/site_tests/platform_CryptohomeChangePassword/platform_CryptohomeChangePassword.py
@@ -9,7 +9,7 @@
from autotest_lib.client.bin import test
from autotest_lib.client.common_lib import error, utils
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
class platform_CryptohomeChangePassword(test.test):
version = 1
diff --git a/client/site_tests/platform_CryptohomeTestAuth/platform_CryptohomeTestAuth.py b/client/site_tests/platform_CryptohomeTestAuth/platform_CryptohomeTestAuth.py
index 36975bb..c320a2c 100644
--- a/client/site_tests/platform_CryptohomeTestAuth/platform_CryptohomeTestAuth.py
+++ b/client/site_tests/platform_CryptohomeTestAuth/platform_CryptohomeTestAuth.py
@@ -9,7 +9,8 @@
from autotest_lib.client.bin import test
from autotest_lib.client.common_lib import error, utils
-from autotest_lib.client.cros import constants, cryptohome
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import cryptohome
class platform_CryptohomeTestAuth(test.test):
version = 1
diff --git a/client/site_tests/platform_SessionManagerBlockDevmodeSetting/platform_SessionManagerBlockDevmodeSetting.py b/client/site_tests/platform_SessionManagerBlockDevmodeSetting/platform_SessionManagerBlockDevmodeSetting.py
index 896dd78..13e6617 100644
--- a/client/site_tests/platform_SessionManagerBlockDevmodeSetting/platform_SessionManagerBlockDevmodeSetting.py
+++ b/client/site_tests/platform_SessionManagerBlockDevmodeSetting/platform_SessionManagerBlockDevmodeSetting.py
@@ -7,8 +7,10 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib.cros import chrome, session_manager
-from autotest_lib.client.cros import constants, cros_ui, ownership
+from autotest_lib.client.common_lib.cros import chrome
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.common_lib.cros import session_manager
+from autotest_lib.client.cros import cros_ui, ownership
def set_block_devmode(value):
diff --git a/client/site_tests/security_DbusMap/security_DbusMap.py b/client/site_tests/security_DbusMap/security_DbusMap.py
index c4fbc02..b8ccbf2 100644
--- a/client/site_tests/security_DbusMap/security_DbusMap.py
+++ b/client/site_tests/security_DbusMap/security_DbusMap.py
@@ -10,7 +10,8 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants, login
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import login
class security_DbusMap(test.test):
version = 2
diff --git a/client/site_tests/security_EnableChromeTesting/security_EnableChromeTesting.py b/client/site_tests/security_EnableChromeTesting/security_EnableChromeTesting.py
index 23c9e5f..f5837b1 100644
--- a/client/site_tests/security_EnableChromeTesting/security_EnableChromeTesting.py
+++ b/client/site_tests/security_EnableChromeTesting/security_EnableChromeTesting.py
@@ -6,7 +6,7 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants
+from autotest_lib.client.common_lib.cros import constants
class security_EnableChromeTesting(test.test):
version = 1
diff --git a/client/site_tests/security_ProfilePermissions/security_ProfilePermissions.py b/client/site_tests/security_ProfilePermissions/security_ProfilePermissions.py
index cf37252..64f9652 100644
--- a/client/site_tests/security_ProfilePermissions/security_ProfilePermissions.py
+++ b/client/site_tests/security_ProfilePermissions/security_ProfilePermissions.py
@@ -10,7 +10,8 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib.cros import chrome
-from autotest_lib.client.cros import constants, cryptohome
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import cryptohome
class security_ProfilePermissions(test.test):
diff --git a/client/site_tests/security_RestartJob/security_RestartJob.py b/client/site_tests/security_RestartJob/security_RestartJob.py
index d66ac40..7979e15 100644
--- a/client/site_tests/security_RestartJob/security_RestartJob.py
+++ b/client/site_tests/security_RestartJob/security_RestartJob.py
@@ -9,7 +9,8 @@
from autotest_lib.client.bin import test, utils
from autotest_lib.client.common_lib import error
-from autotest_lib.client.cros import constants, cros_ui, login
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import cros_ui, login
class security_RestartJob(test.test):
diff --git a/client/site_tests/video_GlitchDetection/video_GlitchDetection.py b/client/site_tests/video_GlitchDetection/video_GlitchDetection.py
index c5d086f..84f9ed5 100755
--- a/client/site_tests/video_GlitchDetection/video_GlitchDetection.py
+++ b/client/site_tests/video_GlitchDetection/video_GlitchDetection.py
@@ -10,7 +10,8 @@
from autotest_lib.client.common_lib import file_utils
from autotest_lib.client.common_lib import sequence_utils
from autotest_lib.client.common_lib.cros import chrome
-from autotest_lib.client.cros import constants, service_stopper
+from autotest_lib.client.common_lib.cros import constants
+from autotest_lib.client.cros import service_stopper
from autotest_lib.client.cros.image_comparison import image_comparison_factory
from autotest_lib.client.cros.video import media_test_factory
from autotest_lib.client.cros.video import sequence_generator
@@ -455,4 +456,4 @@
self.run_chameleon_image_comparison_test()
else:
- self.run_screenshot_image_comparison_test()
\ No newline at end of file
+ self.run_screenshot_image_comparison_test()