Author: gnichols
Date: 2010-03-04 19:06:34 +0000 (Thu, 04 Mar 2010)
New Revision: 411
Modified:
trunk/tests/network/network.py
Log:
555895 - FEAT: results.xml could divide out the various sub tests.
Modified: trunk/tests/network/network.py
===================================================================
--- trunk/tests/network/network.py 2010-03-04 19:05:53 UTC (rev 410)
+++ trunk/tests/network/network.py 2010-03-04 19:06:34 UTC (rev 411)
@@ -82,6 +82,10 @@
return testList
def prepareForRun(self):
+ if self.getTestServer() == None or self.getTestServer() == "unknown":
+ print "Error: No test server was set, test abort"
+ return False
+ print "using test server %s" % self.getTestServer()
hal = Hal()
self.interface = self.getLogicalDeviceName()
print "Testing interface %s" % self.interface
@@ -577,64 +581,65 @@
print "+----------%s info end----------+" % self.interface
print ""
sys.stdout.flush()
-
-
- def run(self):
- if self.getTestServer() == None or self.getTestServer() == "unknown":
- print "Error: No test server was set, test abort"
- return FAILED
- print "using test server %s" % self.getTestServer()
-
- self.prepareForRun()
+ return True
+ def configureInterfaces(self):
sys.stdout.flush()
- returnValue = None
if not self.bounceInterface():
print "Error: could not bounce interface %s" % self.interface
- return FAILED
+ return False
if self.isNFSRootSystem:
if not self.addRoute():
print "Error: could not add route for testing"
- return FAILED
+ return False
self.setSignalHandler(self.removeRoute)
else:
if not self.downAllOtherInterfaces():
print "Error: could not shutdown all other interfaces"
- return FAILED
+ return False
self.setSignalHandler(self.restoreAllOtherInterfaces)
if not self.createTestFile():
print ("Error: Unable to create test file")
+ return False
+
+ return True
+
+
+ def run(self):
+
+ if not self.runSubTest(self.prepareForRun, "Setup", "prepare for
network testing"):
return FAILED
-
- self.printInfo()
+
+ if not self.runSubTest(self.configureInterfaces, "Interface
Configuration"):
+ return FAILED
+
+ if not self.runSubTest(self.printInfo, "Info"):
+ return FAILED
# start testing
- returnValue = self.tcpTest()
- if returnValue == PASSED:
- returnValue = self.udpTest()
- if returnValue == PASSED:
- returnValue = self.nfsTest()
- if returnValue== PASSED:
- returnValue = self.icmpTest()
-
+ success = True
+ if not self.runSubTest(self.tcpTest, "TCP", "tcp latency and
bandwidth test via lmbench"):
+ success = False
+ if not self.runSubTest(self.nfsTest, "NFS", "NFS file transfer
test"):
+ success = False
+ if not self.runSubTest(self.icmpTest, "ICMP"):
+ success = False
+
self.setSignalHandler(None)
if self.isNFSRootSystem:
self.removeRoute()
else:
self.restoreAllOtherInterfaces()
- if returnValue == PASSED:
- result = "passed"
- else:
- returnValue = FAILED
- result = "failed"
+ if success:
+ return PASSED
- print "Network test on device %s %s" % (self.interface, result)
-
- return returnValue
+ # otherwise
+ return FAILED
+
if __name__ == "__main__":
Show replies by date