From fc2a8fd59a0fbfe80704d30b807ef426f6d88069 Mon Sep 17 00:00:00 2001 From: Brian O'Connor Date: Tue, 17 Sep 2013 11:28:10 -0700 Subject: [PATCH] fixed git download for testRemoteController in test_walkthrough.py --- mininet/test/test_walkthrough.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mininet/test/test_walkthrough.py b/mininet/test/test_walkthrough.py index ce104a4..6fa1ce0 100755 --- a/mininet/test/test_walkthrough.py +++ b/mininet/test/test_walkthrough.py @@ -313,12 +313,14 @@ class testWalkthrough( unittest.TestCase ): p.sendline( 'exit' ) p.wait() - @unittest.skipUnless( '1 received' in quietRun( 'ping -c 1 github.com' ), + @unittest.skipUnless( os.path.exists( '/tmp/pox' ) or + '1 received' in quietRun( 'ping -c 1 github.com' ), 'Github is not reachable; cannot download Pox' ) def testRemoteController( self ): "Test Mininet using Pox controller" - p = pexpect.spawn( 'test ! -d /tmp/pox && git clone https://github.com/noxrepo/pox.git /tmp/pox') - p.wait() + if not os.path.exists( '/tmp/pox' ): + p = pexpect.spawn( 'git clone https://github.com/noxrepo/pox.git /tmp/pox' ) + p.expect( pexpect.EOF ) pox = pexpect.spawn( '/tmp/pox/pox.py forwarding.l2_learning' ) net = pexpect.spawn( 'mn --controller=remote,ip=127.0.0.1,port=6633 --test pingall' ) net.expect( '0% dropped' )