lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only uninstall ntpd on COW disk.

Browse Source
This commit is contained in:
Bob Lantz
2014-11-19 04:59:23 -08:00
parent 55b455e9ae
commit 9e0c1549f4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/vm/build.py
+6 -3
View File
@@ -840,10 +840,12 @@ def build( flavor='raring32server', tests=None, pre='', post='', memory=1024 ):
os.chdir( '..' ) os.chdir( '..' )
def runTests( vm, tests=None, pre='', post='', prompt=Prompt ): def runTests( vm, tests=None, pre='', post='', prompt=Prompt, uninstallNtpd=False ):
"Run tests (list) in vm (pexpect object)" "Run tests (list) in vm (pexpect object)"
# We disable ntpd and set the time so that ntpd won't be # We disable ntpd and set the time so that ntpd won't be
# messing with the time during tests # messing with the time during tests. Set to true for a COW
# disk and False for a non-COW disk.
if uninstallNtpd:
removeNtpd( vm ) removeNtpd( vm )
vm.expect( prompt ) vm.expect( prompt )
if Branch: if Branch:
@@ -1021,7 +1023,8 @@ def parseArgs():
exit( 1 ) exit( 1 )
for image in args.image: for image in args.image:
bootAndRun( image, runFunction=runTests, tests=args.test, pre=args.run, bootAndRun( image, runFunction=runTests, tests=args.test, pre=args.run,
post=args.post, memory=args.memory, outputFile=args.out ) post=args.post, memory=args.memory, outputFile=args.out,
uninstallNtpd=True )
if not ( args.depend or args.list or args.clean or args.flavor if not ( args.depend or args.list or args.clean or args.flavor
or args.image ): or args.image ):
parser.print_help() parser.print_help()