commit c1b6ab21b505c86575f86c8a23081ee1d3ae0d4e
author Dan Shi <dshi@google.com> Tue Jun 20 11:56:25 2017 -0700
committer Dan Shi <dshi@google.com> Tue Jun 20 18:57:52 2017 +0000
tree 80af14f663be1dc81bd0b04e08905e31849a3d57
parent 8e00e8b4a421c53a15f751fc90bb06d738ccbd78

[autotest] Test ts_mon first in container functional test

BUG=None
TEST=lxc_functional_test.py

Change-Id: Ia933c58c4cadf9a124082d3b7828f1baab8c6c4e
Reviewed-on: https://chromium-review.googlesource.com/541550
Reviewed-by: Dan Shi <dshi@google.com>
Commit-Queue: Dan Shi <dshi@google.com>
Tested-by: Dan Shi <dshi@google.com>

site_utils/lxc_functional_test.py

diff --git a/site_utils/lxc_functional_test.py b/site_utils/lxc_functional_test.py
index 7184a76..9f5a623 100644
--- a/site_utils/lxc_functional_test.py
+++ b/site_utils/lxc_functional_test.py
@@ -50,6 +50,12 @@
 # Test import
 import common
 import chromite
+
+# This test has to be before the import of autotest_lib, because ts_mon requires
+# httplib2 module in chromite/third_party. The one in Autotest site-packages is
+# out dated.
+%(ts_mon_test)s
+
 from autotest_lib.server import utils
 from autotest_lib.site_utils import lxc
 
@@ -242,7 +248,8 @@
         if utils.is_moblab():
             script.write(TEST_SCRIPT_CONTENT)
         else:
-            script.write(TEST_SCRIPT_CONTENT + TEST_SCRIPT_CONTENT_TS_MON)
+            script.write(TEST_SCRIPT_CONTENT %
+                         {'ts_mon_test': TEST_SCRIPT_CONTENT_TS_MON})
 
     container_result_path = lxc.RESULT_DIR_FMT % TEST_JOB_FOLDER
     container_test_script = os.path.join(container_result_path, TEST_SCRIPT)