Commit 4b8662d2 authored by Martín Ferrari's avatar Martín Ferrari

Prevent kernel oops :-)

parent 677485b3
...@@ -119,7 +119,8 @@ class TestWithDummy(unittest.TestCase): ...@@ -119,7 +119,8 @@ class TestWithDummy(unittest.TestCase):
def setUp(self): def setUp(self):
self.cleanup = [] self.cleanup = []
@test_util.skipUnless(os.getuid() == 0, "Test requires root privileges") #@test_util.skipUnless(os.getuid() == 0, "Test requires root privileges")
@test_util.skip("Test trigger a kernel bug on 2.6.34")
def test_interface_migration(self): def test_interface_migration(self):
node = netns.Node() node = netns.Node()
dummyname = "dummy%d" % os.getpid() dummyname = "dummy%d" % os.getpid()
...@@ -132,7 +133,6 @@ class TestWithDummy(unittest.TestCase): ...@@ -132,7 +133,6 @@ class TestWithDummy(unittest.TestCase):
self.cleanup += [(dummyidx, None)] self.cleanup += [(dummyidx, None)]
# Move manually # Move manually
# import pdb; pdb.set_trace()
netns.iproute.change_netns(dummyidx, node.pid) netns.iproute.change_netns(dummyidx, node.pid)
self.cleanup.remove((dummyidx, None)) self.cleanup.remove((dummyidx, None))
self.cleanup += [(dummyidx, node)] self.cleanup += [(dummyidx, node)]
...@@ -156,7 +156,8 @@ class TestWithDummy(unittest.TestCase): ...@@ -156,7 +156,8 @@ class TestWithDummy(unittest.TestCase):
n.del_if(j) n.del_if(j)
n._slave.change_netns(i, os.getpid()) n._slave.change_netns(i, os.getpid())
iface = netns.iproute.get_if(i) iface = netns.iproute.get_if(i)
#os.system("ip link del %s" % iface.name) # oops here
os.system("ip link del %s" % iface.name)
# FIXME: Links # FIXME: Links
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment