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

Unified Diff: client/tests/kvm/kvm_preprocessing.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 | « client/tests/kvm/kvm_config.py ('k') | client/tests/kvm/kvm_scheduler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tests/kvm/kvm_preprocessing.py
diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py
index 9c53f02d34cbc476ab442b7fa0a909c8457cd1ee..515e3a503d5d4376fe9eee9dbcce963aa449025e 100644
--- a/client/tests/kvm/kvm_preprocessing.py
+++ b/client/tests/kvm/kvm_preprocessing.py
@@ -363,7 +363,7 @@ def postprocess(test, params, env):
del env["tcpdump"]
if params.get("setup_hugepages") == "yes":
- h = kvm_utils.HugePageConfig(params)
+ h = test_setup.HugePageConfig(params)
h.cleanup()
if params.get("type") == "enospc":
« no previous file with comments | « client/tests/kvm/kvm_config.py ('k') | client/tests/kvm/kvm_scheduler.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698