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

Add -q option to apt-get for quieter logging

Browse Source
This commit is contained in:
Bob Lantz
2014-11-10 19:37:11 -08:00
parent 9b5fa1d7ed
commit 635e8f11f3
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/vm/build.py
+16 -10
View File
@@ -162,8 +162,8 @@ def srun( cmd, **kwargs ):
def depend(): def depend():
"Install package dependencies" "Install package dependencies"
log( '* Installing package dependencies' ) log( '* Installing package dependencies' )
run( 'sudo apt-get -y update' ) run( 'sudo apt-get -qy update' )
run( 'sudo apt-get install -y' run( 'sudo install -qy'
' kvm cloud-utils genisoimage qemu-kvm qemu-utils' ' kvm cloud-utils genisoimage qemu-kvm qemu-utils'
' e2fsprogs dnsmasq curl' ' e2fsprogs dnsmasq curl'
' python-setuptools mtools zip' ) ' python-setuptools mtools zip' )
@@ -490,7 +490,7 @@ def login( vm, user='mininet', password='mininet' ):
def removeNtpd( vm, prompt=Prompt, ntpPackage='ntp' ): def removeNtpd( vm, prompt=Prompt, ntpPackage='ntp' ):
"Remove ntpd and set clock immediately" "Remove ntpd and set clock immediately"
log( '* Removing ntpd' ) log( '* Removing ntpd' )
vm.sendline( 'sudo apt-get -y remove ' + ntpPackage ) vm.sendline( 'sudo apt-get -qy remove ' + ntpPackage )
vm.expect( prompt ) vm.expect( prompt )
# Try to make sure that it isn't still running # Try to make sure that it isn't still running
vm.sendline( 'sudo pkill ntpd' ) vm.sendline( 'sudo pkill ntpd' )
@@ -534,28 +534,34 @@ def coreTest( vm, prompt=Prompt ):
log( '* Test', test, 'output:' ) log( '* Test', test, 'output:' )
log( vm.before ) log( vm.before )
def noneTest( vm ):
def installPexpect( vm, prompt=Prompt ):
"install pexpect"
vm.sendline( 'sudo apt-get -qy install python-pexpect' )
vm.expect( prompt )
def noneTest( vm, prompt=Prompt ):
"This test does nothing" "This test does nothing"
installPexpect( vm, prompt )
vm.sendline( 'echo' ) vm.sendline( 'echo' )
def examplesquickTest( vm, prompt=Prompt ): def examplesquickTest( vm, prompt=Prompt ):
"Quick test of mininet examples" "Quick test of mininet examples"
vm.sendline( 'sudo apt-get install python-pexpect' ) installPexpect( vm, prompt )
vm.expect( prompt )
vm.sendline( 'sudo python ~/mininet/examples/test/runner.py -v -quick' ) vm.sendline( 'sudo python ~/mininet/examples/test/runner.py -v -quick' )
def examplesfullTest( vm, prompt=Prompt ): def examplesfullTest( vm, prompt=Prompt ):
"Full (slow) test of mininet examples" "Full (slow) test of mininet examples"
vm.sendline( 'sudo apt-get install python-pexpect' ) installPexpect( vm, prompt )
vm.expect( prompt )
vm.sendline( 'sudo python ~/mininet/examples/test/runner.py -v' ) vm.sendline( 'sudo python ~/mininet/examples/test/runner.py -v' )
def walkthroughTest( vm, prompt=Prompt ): def walkthroughTest( vm, prompt=Prompt ):
"Test mininet walkthrough" "Test mininet walkthrough"
vm.sendline( 'sudo apt-get install python-pexpect' ) installPexpect( vm, prompt )
vm.expect( prompt )
vm.sendline( 'sudo python ~/mininet/mininet/test/test_walkthrough.py -v' ) vm.sendline( 'sudo python ~/mininet/mininet/test/test_walkthrough.py -v' )