Gitiles
Code Review Sign In
gerrit.openfyde.cn / chromium.googlesource.com / chromiumos / platform / factory / 91492a1931ff8bfa45739756aa50f5481cafcdec^! / . / py
commit91492a1931ff8bfa45739756aa50f5481cafcdec[log] [tgz]
authorHung-Te Lin <hungte@chromium.org>Tue Nov 25 18:56:30 2014 +0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>Fri Jan 16 07:13:02 2015 +0000
tree98f7403a857d4932e40d2ef7d0c5506100009878
parentad653509aa0a366edf28a58c488a0a151b104210 [diff]
Dependency cleanup: Move event_log* to test/event_log*.

event_log* requires factory test modules and should not live in top level.

BUG=chromium:403712
TEST=make test

Change-Id: I0ca3da3a82bbe2acf0bc008af86b9c99fac50fff
Reviewed-on: https://chromium-review.googlesource.com/231802
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>

diff --git a/py/gooftool/gooftool.py b/py/gooftool/gooftool.py
index f871295..d2841bf 100755
--- a/py/gooftool/gooftool.py
+++ b/py/gooftool/gooftool.py

@@ -28,7 +28,6 @@
 
 import factory_common  # pylint: disable=W0611
 
-from cros.factory import event_log
 from cros.factory.common import SetupLogging, Shell
 from cros.factory.gooftool import Gooftool
 from cros.factory.gooftool import crosfw
@@ -43,6 +42,7 @@
 from cros.factory.hwdb.yaml_datastore import YamlWrite
 from cros.factory.hwid import common
 from cros.factory.hwid import hwid_utils
+from cros.factory.test import event_log
 from cros.factory.test import factory
 from cros.factory.test.factory import FACTORY_LOG_PATH, DEVICE_STATEFUL_PATH
 from cros.factory.utils import file_utils

diff --git a/py/goofy/goofy.py b/py/goofy/goofy.py
index 284adbc..45b0551 100755
--- a/py/goofy/goofy.py
+++ b/py/goofy/goofy.py

@@ -25,10 +25,9 @@
 from optparse import OptionParser
 
 import factory_common  # pylint: disable=W0611
-from cros.factory import event_log
+from cros.factory.test import event_log
 from cros.factory import system
-from cros.factory.event_log import EventLog, FloatDigit
-from cros.factory.event_log_watcher import EventLogWatcher
+from cros.factory.test.event_log import EventLog, FloatDigit
 from cros.factory.goofy import connection_manager
 from cros.factory.goofy import test_environment
 from cros.factory.goofy import time_sanitizer
@@ -57,6 +56,7 @@
 from cros.factory.test.event import Event
 from cros.factory.test.event import EventClient
 from cros.factory.test.event import EventServer
+from cros.factory.test.event_log_watcher import EventLogWatcher
 from cros.factory.test.factory import TestState
 from cros.factory.test.utils import Enum
 from cros.factory.tools.key_filter import KeyFilter

diff --git a/py/goofy/invocation.py b/py/goofy/invocation.py
index 1dd6cc4..6ca4e7b 100755
--- a/py/goofy/invocation.py
+++ b/py/goofy/invocation.py

@@ -29,7 +29,7 @@
 from setproctitle import setproctitle
 
 import factory_common  # pylint: disable=W0611
-from cros.factory import event_log
+from cros.factory.test import event_log
 from cros.factory.privacy import FilterDict
 from cros.factory.system.service_manager import ServiceManager
 from cros.factory.test import factory

diff --git a/py/goofy/system_log_manager.py b/py/goofy/system_log_manager.py
index 346bda1..e1ad7bb 100644
--- a/py/goofy/system_log_manager.py
+++ b/py/goofy/system_log_manager.py

@@ -16,7 +16,7 @@
 from urlparse import urlparse
 
 import factory_common  # pylint: disable=W0611
-from cros.factory import event_log
+from cros.factory.test import event_log
 from cros.factory.test import shopfloor
 from cros.factory.utils.debug_utils import CatchException
 from cros.factory.utils.process_utils import Spawn, TerminateOrKillProcess

diff --git a/py/goofy/system_log_manager_unittest.py b/py/goofy/system_log_manager_unittest.py
index 814e48f..dbc9746 100755
--- a/py/goofy/system_log_manager_unittest.py
+++ b/py/goofy/system_log_manager_unittest.py

@@ -19,7 +19,7 @@
 from urlparse import urlparse
 
 import factory_common  # pylint: disable=W0611
-from cros.factory import event_log
+from cros.factory.test import event_log
 from cros.factory.test import shopfloor
 
 from cros.factory.utils import debug_utils

diff --git a/py/test/camera_utils.py b/py/test/camera_utils.py
index 4b61f9c..3407d12 100644
--- a/py/test/camera_utils.py
+++ b/py/test/camera_utils.py

@@ -19,7 +19,7 @@
 import tempfile
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import TimedUuid
+from cros.factory.test.event_log import TimedUuid
 from cros.factory.utils import file_utils
 from cros.factory.utils.process_utils import Spawn
 

diff --git a/py/test/e2e_test/ui_actuator.py b/py/test/e2e_test/ui_actuator.py
index 776fdd7..f20462f 100644
--- a/py/test/e2e_test/ui_actuator.py
+++ b/py/test/e2e_test/ui_actuator.py

@@ -9,7 +9,7 @@
 import time
 
 import factory_common  # pylint: disable=W0611
-from cros.factory import event_log
+from cros.factory.test import event_log
 from cros.factory.test import event
 from cros.factory.test import test_ui
 from cros.factory.test import utils

diff --git a/py/event_log.py b/py/test/event_log.py
similarity index 100%
rename from py/event_log.py
rename to py/test/event_log.py

diff --git a/py/event_log_unittest.py b/py/test/event_log_unittest.py
similarity index 99%
rename from py/event_log_unittest.py
rename to py/test/event_log_unittest.py
index 66cdd48..7fca33f 100755
--- a/py/event_log_unittest.py
+++ b/py/test/event_log_unittest.py

@@ -23,7 +23,7 @@
 import uuid
 import yaml
 
-from cros.factory import event_log
+from cros.factory.test import event_log
 from cros.factory.utils import file_utils
 from cros.factory.hwid.common import ProbedComponentResult
 

diff --git a/py/event_log_watcher.py b/py/test/event_log_watcher.py
similarity index 99%
rename from py/event_log_watcher.py
rename to py/test/event_log_watcher.py
index 57ca78f..fb39a27 100644
--- a/py/event_log_watcher.py
+++ b/py/test/event_log_watcher.py

@@ -10,7 +10,7 @@
 import shelve
 import threading
 
-from cros.factory import event_log
+from cros.factory.test import event_log
 from cros.factory.test import factory
 from cros.factory.test import utils
 from cros.factory.utils.shelve_utils import OpenShelfOrBackup

diff --git a/py/event_log_watcher_unittest.py b/py/test/event_log_watcher_unittest.py
similarity index 98%
rename from py/event_log_watcher_unittest.py
rename to py/test/event_log_watcher_unittest.py
index 556c215..3f1115f 100755
--- a/py/event_log_watcher_unittest.py
+++ b/py/test/event_log_watcher_unittest.py

@@ -13,9 +13,9 @@
 import time
 import unittest
 
-from cros.factory import event_log
-from cros.factory import event_log_watcher
-from cros.factory.event_log_watcher import Chunk, EventLogWatcher
+from cros.factory.test import event_log
+from cros.factory.test import event_log_watcher
+from cros.factory.test.event_log_watcher import Chunk, EventLogWatcher
 
 MOCK_LOG_NAME = lambda x: 'mylog12345%d' % x
 def MOCK_PREAMBLE(x, sync_marker=False):

diff --git a/py/test/pytests/audio_quality.py b/py/test/pytests/audio_quality.py
index 58b6644..0a2cf93 100644
--- a/py/test/pytests/audio_quality.py
+++ b/py/test/pytests/audio_quality.py

@@ -25,8 +25,8 @@
 import zipfile
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
 from cros.factory.test.args import Arg
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import network
 from cros.factory.test import shopfloor
@@ -475,7 +475,7 @@
       test_result = {}
       """
       Remarks:
-      1. cros.factory.event_log requires special format for key string
+      1. cros.factory.test.event_log requires special format for key string
       2. because the harmonic of some frequencies are not valid, we may
          have empty values in certain fields
       3. The missing fields are always in the last columns

diff --git a/py/test/pytests/bad_blocks.py b/py/test/pytests/bad_blocks.py
index b09e78e..5f5048d 100644
--- a/py/test/pytests/bad_blocks.py
+++ b/py/test/pytests/bad_blocks.py

@@ -26,7 +26,7 @@
 
 import factory_common  # pylint: disable=W0611
 
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import ui_templates
 from cros.factory.test import utils

diff --git a/py/test/pytests/battery_cycle.py b/py/test/pytests/battery_cycle.py
index f852dc8..d7815b5 100644
--- a/py/test/pytests/battery_cycle.py
+++ b/py/test/pytests/battery_cycle.py

@@ -23,7 +23,7 @@
 
 import factory_common  # pylint: disable=W0611
 from cros.factory import system
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.system import Board, SystemStatus
 from cros.factory.test import test_ui
 from cros.factory.test import ui_templates

diff --git a/py/test/pytests/blocking_charge.py b/py/test/pytests/blocking_charge.py
index 4e9aa63..162b0a2 100644
--- a/py/test/pytests/blocking_charge.py
+++ b/py/test/pytests/blocking_charge.py

@@ -17,7 +17,7 @@
 
 import factory_common  # pylint: disable=W0611
 from cros.factory import system
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.system.board import Board
 from cros.factory.test import test_ui
 from cros.factory.test import ui_templates

diff --git a/py/test/pytests/bluetooth.py b/py/test/pytests/bluetooth.py
index 75025ba..8765cf0 100644
--- a/py/test/pytests/bluetooth.py
+++ b/py/test/pytests/bluetooth.py

@@ -24,13 +24,13 @@
 import time
 import unittest
 
-from cros.factory.event_log import Log
 from cros.factory.system.bluetooth import BluetoothManager
 from cros.factory.system.bluetooth import BluetoothManagerException
 from cros.factory.test import factory
 from cros.factory.test import test_ui
 from cros.factory.test import ui_templates
 from cros.factory.test.args import Arg
+from cros.factory.test.event_log import Log
 from cros.factory.test.factory_task import FactoryTask, FactoryTaskManager
 from cros.factory.test.test_ui import MakeLabel
 from cros.factory.test.utils import StartDaemonThread

diff --git a/py/test/pytests/call_shopfloor.py b/py/test/pytests/call_shopfloor.py
index be155e6..9dbc81c 100644
--- a/py/test/pytests/call_shopfloor.py
+++ b/py/test/pytests/call_shopfloor.py

@@ -17,7 +17,7 @@
 
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.privacy import FilterDict
 from cros.factory.test import factory
 from cros.factory.test import shopfloor

diff --git a/py/test/pytests/camera_fixture.py b/py/test/pytests/camera_fixture.py
index d14f172..7a843a6 100644
--- a/py/test/pytests/camera_fixture.py
+++ b/py/test/pytests/camera_fixture.py

@@ -206,8 +206,8 @@
 import xmlrpclib
 
 import factory_common  # pylint: disable=W0611
-from cros.factory import event_log
 from cros.factory.system.i2cbus import I2CBus
+from cros.factory.test import event_log
 from cros.factory.test import factory
 from cros.factory.test import leds
 from cros.factory.test import network

diff --git a/py/test/pytests/cellular_gobi_rssi.py b/py/test/pytests/cellular_gobi_rssi.py
index 800842e..dd8adf5 100644
--- a/py/test/pytests/cellular_gobi_rssi.py
+++ b/py/test/pytests/cellular_gobi_rssi.py

@@ -17,7 +17,7 @@
 
 import factory_common  # pylint: disable=W0611
 
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.rf import cellular
 from cros.factory.rf.utils import CheckPower
 from cros.factory.test import factory

diff --git a/py/test/pytests/charger.py b/py/test/pytests/charger.py
index e84b5e6..d82f48d 100644
--- a/py/test/pytests/charger.py
+++ b/py/test/pytests/charger.py

@@ -18,7 +18,7 @@
 
 import factory_common  # pylint: disable=W0611
 from cros.factory import system
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.system.board import Board
 from cros.factory.test import factory
 from cros.factory.test import test_ui

diff --git a/py/test/pytests/check_image_version.py b/py/test/pytests/check_image_version.py
index c53d2b4..32743e0 100644
--- a/py/test/pytests/check_image_version.py
+++ b/py/test/pytests/check_image_version.py

@@ -15,7 +15,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.system import SystemInfo, SystemStatus
 from cros.factory.test import factory
 from cros.factory.test import shopfloor

diff --git a/py/test/pytests/check_wifi_calibration.py b/py/test/pytests/check_wifi_calibration.py
index 9e33dc5..b50fa11 100644
--- a/py/test/pytests/check_wifi_calibration.py
+++ b/py/test/pytests/check_wifi_calibration.py

@@ -17,7 +17,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import test_ui
 from cros.factory.test import ui_templates

diff --git a/py/test/pytests/countdown.py b/py/test/pytests/countdown.py
index cb7f595..3525bf0 100644
--- a/py/test/pytests/countdown.py
+++ b/py/test/pytests/countdown.py

@@ -15,7 +15,7 @@
 
 import factory_common  # pylint: disable=W0611
 from cros.factory import system
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.system import SystemStatus
 from cros.factory.test import factory, test_ui
 from cros.factory.test.args import Arg

diff --git a/py/test/pytests/ectool_i2c_dev_id.py b/py/test/pytests/ectool_i2c_dev_id.py
index f183efb..0bd5275 100644
--- a/py/test/pytests/ectool_i2c_dev_id.py
+++ b/py/test/pytests/ectool_i2c_dev_id.py

@@ -11,7 +11,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test.args import Arg
 from cros.factory.utils.process_utils import SpawnOutput
 

diff --git a/py/test/pytests/emmc_check_fw_version.py b/py/test/pytests/emmc_check_fw_version.py
index 88aa9a1..0c9adac 100644
--- a/py/test/pytests/emmc_check_fw_version.py
+++ b/py/test/pytests/emmc_check_fw_version.py

@@ -31,7 +31,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import test_ui
 from cros.factory.test import ui_templates
 from cros.factory.test.args import Arg

diff --git a/py/test/pytests/finalize/finalize.py b/py/test/pytests/finalize/finalize.py
index bc4ba57..258fcab 100644
--- a/py/test/pytests/finalize/finalize.py
+++ b/py/test/pytests/finalize/finalize.py

@@ -22,7 +22,7 @@
 
 import factory_common  # pylint: disable=W0611
 from cros.factory import system
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.gooftool import Gooftool
 from cros.factory.system import SystemInfo
 from cros.factory.test import factory

diff --git a/py/test/pytests/hwid_v3.py b/py/test/pytests/hwid_v3.py
index bdee5f6..71be20e 100644
--- a/py/test/pytests/hwid_v3.py
+++ b/py/test/pytests/hwid_v3.py

@@ -11,7 +11,7 @@
 import yaml
 
 import factory_common # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.gooftool import probe
 from cros.factory.hwid import common
 from cros.factory.hwid import database

diff --git a/py/test/pytests/i2c_probe.py b/py/test/pytests/i2c_probe.py
index 72f1b53..0d2be6f 100644
--- a/py/test/pytests/i2c_probe.py
+++ b/py/test/pytests/i2c_probe.py

@@ -9,7 +9,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test.args import Arg
 from cros.factory.utils.process_utils import SpawnOutput

diff --git a/py/test/pytests/lid_switch/lid_switch.py b/py/test/pytests/lid_switch/lid_switch.py
index 64ba60b..211a603 100644
--- a/py/test/pytests/lid_switch/lid_switch.py
+++ b/py/test/pytests/lid_switch/lid_switch.py

@@ -14,7 +14,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 
 from cros.factory.test import test_ui
 from cros.factory.test.args import Arg

diff --git a/py/test/pytests/line_check_item.py b/py/test/pytests/line_check_item.py
index fd46b35..a6bb639 100644
--- a/py/test/pytests/line_check_item.py
+++ b/py/test/pytests/line_check_item.py

@@ -11,7 +11,7 @@
 from collections import namedtuple
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test.args import Arg
 from cros.factory.test import factory
 from cros.factory.test import test_ui

diff --git a/py/test/pytests/probe_cellular_info.py b/py/test/pytests/probe_cellular_info.py
index 000b83c..2d84aac 100644
--- a/py/test/pytests/probe_cellular_info.py
+++ b/py/test/pytests/probe_cellular_info.py

@@ -14,7 +14,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test.args import Arg
 from cros.factory.test.shopfloor import UpdateDeviceData
 from cros.factory.utils.process_utils import CheckOutput

diff --git a/py/test/pytests/probe_sim.py b/py/test/pytests/probe_sim.py
index 39cc222..240fabc 100644
--- a/py/test/pytests/probe_sim.py
+++ b/py/test/pytests/probe_sim.py

@@ -24,7 +24,7 @@
 import uuid
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import test_ui
 from cros.factory.test import ui_templates
 from cros.factory.test.args import Arg

diff --git a/py/test/pytests/removable_storage/removable_storage.py b/py/test/pytests/removable_storage/removable_storage.py
index 443a7a4..fe2d9e3 100644
--- a/py/test/pytests/removable_storage/removable_storage.py
+++ b/py/test/pytests/removable_storage/removable_storage.py

@@ -24,7 +24,7 @@
 
 import factory_common  # pylint: disable=W0611
 from cros.factory import system
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import countdown_timer
 from cros.factory.test import factory
 from cros.factory.test import test_ui

diff --git a/py/test/pytests/rf_framework.py b/py/test/pytests/rf_framework.py
index cf006ad..2daad8d 100644
--- a/py/test/pytests/rf_framework.py
+++ b/py/test/pytests/rf_framework.py

@@ -17,7 +17,7 @@
 import yaml
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log, GetDeviceId
+from cros.factory.test.event_log import Log, GetDeviceId
 from cros.factory.goofy.goofy import CACHES_DIR
 from cros.factory.rf.tools.csv_writer import WriteCsv
 from cros.factory.rf.utils import DownloadParameters

diff --git a/py/test/pytests/rf_radiated/rf_radiated.py b/py/test/pytests/rf_radiated/rf_radiated.py
index fca7912..8e9539c 100644
--- a/py/test/pytests/rf_radiated/rf_radiated.py
+++ b/py/test/pytests/rf_radiated/rf_radiated.py

@@ -63,10 +63,10 @@
 
 import factory_common  # pylint: disable=W0611
 
-from cros.factory import event_log
 from cros.factory import system
 from cros.factory.rf import n1914a
 from cros.factory.test.args import Arg
+from cros.factory.test import event_log
 from cros.factory.test import factory
 from cros.factory.test import leds
 from cros.factory.test import shopfloor

diff --git a/py/test/pytests/scan/scan.py b/py/test/pytests/scan/scan.py
index 1de0027..1ea1b08 100644
--- a/py/test/pytests/scan/scan.py
+++ b/py/test/pytests/scan/scan.py

@@ -13,7 +13,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.system import vpd
 from cros.factory.test import factory
 from cros.factory.test import shopfloor

diff --git a/py/test/pytests/select_aux_field.py b/py/test/pytests/select_aux_field.py
index 5ac2df3..92eeed3 100644
--- a/py/test/pytests/select_aux_field.py
+++ b/py/test/pytests/select_aux_field.py

@@ -8,7 +8,7 @@
 
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import shopfloor
 from cros.factory.test import test_ui

diff --git a/py/test/pytests/select_for_sampling.py b/py/test/pytests/select_for_sampling.py
index 1a28b1b..80db81e 100644
--- a/py/test/pytests/select_for_sampling.py
+++ b/py/test/pytests/select_for_sampling.py

@@ -15,7 +15,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import shopfloor
 from cros.factory.test.args import Arg

diff --git a/py/test/pytests/shutdown/shutdown.py b/py/test/pytests/shutdown/shutdown.py
index bebcf26..510b9fc 100644
--- a/py/test/pytests/shutdown/shutdown.py
+++ b/py/test/pytests/shutdown/shutdown.py

@@ -13,7 +13,7 @@
 from jsonrpclib import ProtocolError
 
 import factory_common  # pylint: disable=W0611
-from cros.factory import event_log
+from cros.factory.test import event_log
 from cros.factory.test import factory
 from cros.factory.test import state
 from cros.factory.test import test_ui

diff --git a/py/test/pytests/start/start.py b/py/test/pytests/start/start.py
index 076317e..c82b42f 100644
--- a/py/test/pytests/start/start.py
+++ b/py/test/pytests/start/start.py

@@ -26,7 +26,7 @@
 
 import factory_common  # pylint: disable=W0611
 from cros.factory import system
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import shopfloor
 from cros.factory.test import test_ui

diff --git a/py/test/pytests/suspend_resume.py b/py/test/pytests/suspend_resume.py
index 1e43cd3..ea1162e 100644
--- a/py/test/pytests/suspend_resume.py
+++ b/py/test/pytests/suspend_resume.py

@@ -25,7 +25,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import test_ui
 from cros.factory.test import utils

diff --git a/py/test/pytests/sysfs_battery.py b/py/test/pytests/sysfs_battery.py
index e22c2bd..085ab8d 100644
--- a/py/test/pytests/sysfs_battery.py
+++ b/py/test/pytests/sysfs_battery.py

@@ -13,7 +13,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test.args import Arg
 from cros.factory.test.test_ui import MakeLabel, UI
 from cros.factory.test.ui_templates import OneScrollableSection

diff --git a/py/test/pytests/thermal_load.py b/py/test/pytests/thermal_load.py
index 9348dd4..94447ba 100644
--- a/py/test/pytests/thermal_load.py
+++ b/py/test/pytests/thermal_load.py

@@ -21,7 +21,7 @@
 
 import factory_common # pylint: disable=W0611
 from cros.factory.system import SystemStatus
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test.args import Arg
 from cros.factory.test.utils import LoadManager
 

diff --git a/py/test/pytests/thermal_slope.py b/py/test/pytests/thermal_slope.py
index 34b1e93..b747a92 100644
--- a/py/test/pytests/thermal_slope.py
+++ b/py/test/pytests/thermal_slope.py

@@ -38,7 +38,7 @@
 
 import factory_common # pylint: disable=W0611
 from cros.factory import system
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.system import SystemStatus
 from cros.factory.system.msr import MSRSnapshot
 from cros.factory.test import factory

diff --git a/py/test/pytests/touchscreen_calibration/touchscreen_calibration.py b/py/test/pytests/touchscreen_calibration/touchscreen_calibration.py
index e721896..4f760a2 100644
--- a/py/test/pytests/touchscreen_calibration/touchscreen_calibration.py
+++ b/py/test/pytests/touchscreen_calibration/touchscreen_calibration.py

@@ -18,7 +18,7 @@
 import sysfs_server
 import touchscreen_calibration_utils
 
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import shopfloor
 from cros.factory.test import utils

diff --git a/py/test/pytests/touchscreen_uniformity.py b/py/test/pytests/touchscreen_uniformity.py
index c76b24f..15c01e7 100644
--- a/py/test/pytests/touchscreen_uniformity.py
+++ b/py/test/pytests/touchscreen_uniformity.py

@@ -35,7 +35,7 @@
 import numpy
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import test_ui
 from cros.factory.test import ui_templates
 from cros.factory.test.args import Arg

diff --git a/py/test/pytests/usb_probe.py b/py/test/pytests/usb_probe.py
index da34eec..cf08c6e 100644
--- a/py/test/pytests/usb_probe.py
+++ b/py/test/pytests/usb_probe.py

@@ -24,7 +24,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test.args import Arg
 from cros.factory.utils.process_utils import SpawnOutput
 

diff --git a/py/test/pytests/verify_components.py b/py/test/pytests/verify_components.py
index fd1e76a..054356e 100644
--- a/py/test/pytests/verify_components.py
+++ b/py/test/pytests/verify_components.py

@@ -13,7 +13,7 @@
 import unittest
 
 import factory_common # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.gooftool import Gooftool
 from cros.factory.hwid import database
 from cros.factory.hwid import hwid_utils

diff --git a/py/test/pytests/vswr/vswr.py b/py/test/pytests/vswr/vswr.py
index 6605952..2aa5d53 100644
--- a/py/test/pytests/vswr/vswr.py
+++ b/py/test/pytests/vswr/vswr.py

@@ -41,7 +41,7 @@
 
 import factory_common  # pylint: disable=W0611
 
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.goofy.connection_manager import PingHost
 from cros.factory.goofy.goofy import CACHES_DIR
 from cros.factory.rf.e5071c_scpi import ENASCPI

diff --git a/py/test/pytests/wifi_throughput.py b/py/test/pytests/wifi_throughput.py
index 7df7d5b..8c3e959 100644
--- a/py/test/pytests/wifi_throughput.py
+++ b/py/test/pytests/wifi_throughput.py

@@ -73,9 +73,9 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory import event_log
 from cros.factory import system
 from cros.factory.system import service_manager
+from cros.factory.test import event_log
 from cros.factory.test import factory, leds
 from cros.factory.test import shopfloor
 from cros.factory.test.args import Arg, Args

diff --git a/py/test/pytests/wireless_antenna.py b/py/test/pytests/wireless_antenna.py
index c766c80..5c29566 100644
--- a/py/test/pytests/wireless_antenna.py
+++ b/py/test/pytests/wireless_antenna.py

@@ -26,7 +26,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import test_ui
 from cros.factory.test.args import Arg

diff --git a/py/test/pytests/wireless_radiotap.py b/py/test/pytests/wireless_radiotap.py
index 4a688b0..c7b26da 100644
--- a/py/test/pytests/wireless_radiotap.py
+++ b/py/test/pytests/wireless_radiotap.py

@@ -31,7 +31,7 @@
 import unittest
 
 import factory_common  # pylint: disable=W0611
-from cros.factory.event_log import Log
+from cros.factory.test.event_log import Log
 from cros.factory.test import factory
 from cros.factory.test import test_ui
 from cros.factory.test.args import Arg