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

Unified Diff: client/tests/kvm/tests/ethtool.py

Issue 6551020: Merge remote branch 'autotest-upstream/master' into try-box1 (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/test_setup.py ('k') | client/tests/kvm/tests/file_transfer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tests/kvm/tests/ethtool.py
diff --git a/client/tests/kvm/tests/ethtool.py b/client/tests/kvm/tests/ethtool.py
index 81e45d3da83a5e053ba2f3ccb0881360da14e0c6..d7c6b5746e594c59ee8e6d20628af82c67f0fee9 100644
--- a/client/tests/kvm/tests/ethtool.py
+++ b/client/tests/kvm/tests/ethtool.py
@@ -191,7 +191,11 @@ def run_ethtool(test, params, env):
filename = "/tmp/ethtool.dd"
guest_ip = vm.get_address()
ethname = kvm_test_utils.get_linux_ifname(session, vm.get_mac_address(0))
- supported_features = params.get("supported_features").split()
+ supported_features = params.get("supported_features")
+ if supported_features:
+ supported_features = supported_features.split()
+ else:
+ supported_features = []
test_matrix = {
# type:(callback, (dependence), (exclude)
"tx": (tx_callback, (), ()),
« no previous file with comments | « client/tests/kvm/test_setup.py ('k') | client/tests/kvm/tests/file_transfer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698