rolled back to iperf format option, and changed 'cpu' variable to 'pct'

This commit is contained in:
Cody Burkard
2014-07-08 16:53:45 -07:00
parent 0e733c7754
commit 3131c90344
+5 -4
View File
@@ -55,8 +55,9 @@ class testOptionsTopoCommon( object ):
""" """
self.assertGreaterEqual( float(measured), self.assertGreaterEqual( float(measured),
float(expected) * tolerance_frac ) float(expected) * tolerance_frac )
self.assertLess( float( measured ), self.assertLessEqual( float( measured ),
float(expected) + (1-tolerance_frac) * float( expected ) ) float(expected) + (1-tolerance_frac)
* float( expected ) )
def testCPULimits( self ): def testCPULimits( self ):
"Verify topology creation with CPU limits set for both schedulers." "Verify topology creation with CPU limits set for both schedulers."
@@ -70,9 +71,9 @@ class testOptionsTopoCommon( object ):
mn.start() mn.start()
results = mn.runCpuLimitTest( cpu=CPU_FRACTION ) results = mn.runCpuLimitTest( cpu=CPU_FRACTION )
mn.stop() mn.stop()
for cpu in results: for pct in results:
#divide cpu by 100 to convert from percentage to fraction #divide cpu by 100 to convert from percentage to fraction
self.assertWithinTolerance( cpu/100, CPU_FRACTION, CPU_TOLERANCE ) self.assertWithinTolerance( pct/100, CPU_FRACTION, CPU_TOLERANCE )
def testLinkBandwidth( self ): def testLinkBandwidth( self ):
"Verify that link bandwidths are accurate within a bound." "Verify that link bandwidths are accurate within a bound."