commit 4b1b6c0b40b4a014ad88217b972fb7e155a8a859
author Joel Kitching <kitching@google.com> Tue May 10 14:34:30 2016 +0800
committer chrome-bot <chrome-bot@chromium.org> Mon May 16 01:00:51 2016 -0700
tree 5f99469be5f52652932214b0b3bcadd80ad10016
parent 1adddf016c43a00e01d5860bf8561693f3d8fbe4

env.paths: move path functions from test.factory

Refactor path-related functions and constants.  Retain
aliases in test.factory for backwards compatibility.

from:
  cros.factory.test.factory
into:
  cros.factory.test.env.paths

moved:
  get_factory_root()
  get_log_root()
  get_state_root()
  get_test_data_root()
  CONSOLE_LOG_PATH --> GetConsoleLogPath()
  FACTORY_LOG_PATH --> GetFactoryLogPath()
  FACTORY_LOG_PATH_ON_DEVICE

BUG=None
TEST=Run test suite

Change-Id: I6b1af008df4fa283b9a1d1e942c353a0e5241135
Reviewed-on: https://chromium-review.googlesource.com/343539
Commit-Ready: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Chih-Yu Huang <akahuang@chromium.org>

py/gooftool/commands.py

diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index bfd5b4a..339eaa0 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -44,7 +44,6 @@
 from cros.factory.hwid.v3 import hwid_utils
 from cros.factory.test import event_log
 from cros.factory.test.env import paths
-from cros.factory.test.factory import FACTORY_LOG_PATH
 from cros.factory.test.rules import phase
 from cros.factory.test.rules.privacy import FilterDict
 from cros.factory.utils import file_utils
@@ -832,7 +831,7 @@
 
   # Intentionally ignoring dotfiles in EVENT_LOG_DIR.
   tar_cmd = 'cd %s ; tar cJf %s *' % (event_log.EVENT_LOG_DIR, target_path)
-  tar_cmd += ' --add-file %s' % FACTORY_LOG_PATH
+  tar_cmd += ' --add-file %s' % paths.GetFactoryLogPath()
   if add_file:
     for f in add_file:
       # Require absolute paths since the tar command may change the