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

Unified Diff: server/site_tests/network_WiFiMatFunc/network_WiFiMatFunc.py

Issue 3431008: Consoldidate wifi test suite boilerplate into site_wifitest.py (Closed) Base URL: ssh://gitrw.chromium.org/autotest.git
Patch Set: Sneaky merge line fixed. Created 10 years, 3 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 | « server/site_tests/network_WiFiMatFunc/control ('k') | server/site_tests/network_WiFiSecMat/control » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: server/site_tests/network_WiFiMatFunc/network_WiFiMatFunc.py
diff --git a/server/site_tests/network_WiFiMatFunc/network_WiFiMatFunc.py b/server/site_tests/network_WiFiMatFunc/network_WiFiMatFunc.py
index 994ce38d566c399d79f71ec4521f936a7de98a2f..ab6a1ef96a2a37a913bf143ea6113aacc91cffa8 100644
--- a/server/site_tests/network_WiFiMatFunc/network_WiFiMatFunc.py
+++ b/server/site_tests/network_WiFiMatFunc/network_WiFiMatFunc.py
@@ -15,42 +15,7 @@ router - the IP address of the WiFi AP/Router and the names of the
wifi and wired devices to configure
"""
+from autotest_lib.server import site_wifitest
-from autotest_lib.client.bin import utils
-from autotest_lib.client.common_lib import error
-from autotest_lib.server import autotest, site_wifitest, test
-
-import logging
-
-
-class network_WiFiMatFunc(test.test):
- version = 1
-
- def expect_failure(self, name, reason):
- if reason is None:
- reason = "no reason given"
- logging.info("%s: ignore failure (%s)", name, reason)
-
-
- # The testcase config, setup, etc are done out side the individual
- # test loop, in the control file.
- def run_once(self, testcase, config):
- name = testcase['name']
- try:
- if 'skip_test' in testcase:
- logging.info("%s: SKIP: %s", name, testcase['skip_test'])
- else:
- wt = site_wifitest.WiFiTest(name, testcase['steps'], config)
- wt.run()
- wt.write_keyvals(self)
- except error.TestFail:
- if 'expect_failure' in testcase:
- self.expect_failure(name, testcase['expect_failure'])
- else:
- raise
- except Exception, e:
- if 'expect_failure' in testcase:
- self.expect_failure(name, testcase['expect_failure'])
- else:
- raise error.TestFail(e)
-
+class network_WiFiMatFunc(site_wifitest.test):
+ pass
« no previous file with comments | « server/site_tests/network_WiFiMatFunc/control ('k') | server/site_tests/network_WiFiSecMat/control » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698