Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: frontend/afe/resources_test.py

Issue 6539001: Merge remote branch 'cros/upstream' into master. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master
Patch Set: patch Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « frontend/afe/frontend_test_utils.py ('k') | frontend/frontend_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: frontend/afe/resources_test.py
diff --git a/frontend/afe/resources_test.py b/frontend/afe/resources_test.py
index 9120335cf18ef5c3bee5d60d164276dabdf3c5b9..bb3808ae08d438fff45af8cd191792b9a8989fee 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
« no previous file with comments | « frontend/afe/frontend_test_utils.py ('k') | frontend/frontend_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698