Merge remote branch 'cros/upstream' into master.
Merged to upstream autotest @5216~@5235.
Most of the stuff are from Olof's arm cross compiling and some misc changes from Dale Curtis.
As usual,the entire change list description is too big to enlist here. Please refer to upstream (http://autotest.kernel.org/browser) for more details.
BUG=none
TEST=1. emerge-arm-generic autotest autotest-deps autotest-tests
2. emerge-x86-generic autotest autotest-deps autotest-tests
3. run bvt from both src/third_party and inside emerged
chroot/..usr/local/autotest.
Seems fine. No regression found.
Review URL: http://codereview.chromium.org/6539001
Change-Id: I613929ec9c29849db5110ae8234bc68a80f4d2d5
diff --git a/frontend/afe/resources_test.py b/frontend/afe/resources_test.py
index 9120335..bb3808a 100755
--- a/frontend/afe/resources_test.py
+++ b/frontend/afe/resources_test.py
@@ -2,6 +2,14 @@
import common
import unittest
+
+# This has to be done very early.
+from autotest_lib.client.common_lib import global_config
+global_config.global_config.override_config_value(
+ 'HOSTS', 'default_protection',
+ 'NO_PROTECTION')
+from autotest_lib.client.common_lib import host_protections
+
from autotest_lib.frontend import setup_django_environment
from autotest_lib.frontend import setup_test_environment
from django.test import client