atest_venv_entry: import packages in right order.
1) change import order.
2) add required skylab_inventory/venv requirements to autotest/venv.
BUG=chromium:826492
TEST=None
Change-Id: Ie4e25e1f018bed0475bf954f964cd906bcdf12c6
Reviewed-on: https://chromium-review.googlesource.com/1020501
Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Ningning Xia <nxia@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/cli/atest_venv_entry.py b/cli/atest_venv_entry.py
index a391fda..c4a6c39 100755
--- a/cli/atest_venv_entry.py
+++ b/cli/atest_venv_entry.py
@@ -3,7 +3,6 @@
import sys
import common
-from autotest_lib.cli import atest
_AUTOTEST_ROOT = os.path.realpath(os.path.join(__file__, '..', '..'))
_CHROMIUMOS_ROOT = os.path.abspath(
@@ -20,5 +19,7 @@
raise Exception('Error when importing skylab_inventory (venv dir: %s): %s'
% (_SKYLAB_INVENTORY_DIR, e))
+# Import atest after 'import skylab_inventory' as it uses skylab_inventory
+from autotest_lib.cli import atest
sys.exit(atest.main())
diff --git a/venv/requirements.txt b/venv/requirements.txt
index 2219897..0555833 100644
--- a/venv/requirements.txt
+++ b/venv/requirements.txt
@@ -21,3 +21,9 @@
setuptools==28.2.0
six==1.10.0
subprocess32==3.2.7
+
+#Extra requirements for chromiumos/infra/skylab_inventory
+#Do NOT need the mysql versions for autotest
+#mysql-connector-python==8.0.6
+#MySQL-python==1.2.5
+protobuf==3.0.0