From 45d365f98b6b2f7e2cb5c03a39e2de213c860a8b Mon Sep 17 00:00:00 2001 From: Bob Lantz <rlantz@cs.stanford.edu> Date: Mon, 26 Aug 2013 15:29:00 -0700 Subject: [PATCH] Need a few more skipUnless() checks. --- mininet/test/test_nets.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mininet/test/test_nets.py b/mininet/test/test_nets.py index 45fc3eb2..f378ce89 100755 --- a/mininet/test/test_nets.py +++ b/mininet/test/test_nets.py @@ -34,10 +34,14 @@ class testSingleSwitchOVSKernel( testSingleSwitchCommon, unittest.TestCase ): "Test ping with single switch topology (OVS kernel switch)." switchClass = OVSKernelSwitch + +@unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' ) class testSingleSwitchIVS( testSingleSwitchCommon, unittest.TestCase ): "Test ping with single switch topology (IVS switch)." switchClass = IVSSwitch +@unittest.skipUnless( quietRun( 'which ofprotocol' ), + 'Reference user switch is not installed' ) class testSingleSwitchUserspace( testSingleSwitchCommon, unittest.TestCase ): "Test ping with single switch topology (Userspace switch)." switchClass = UserSwitch -- GitLab