[lnst] ConnectionHandler: import IPRSocket directly to fix isinstance check
by Jiří Pírko
commit 9c51f7745c508866f4e0f0e4cce36356e234009a
Author: Jan Tluka <jtluka(a)redhat.com>
Date: Tue Mar 3 12:49:37 2015 +0100
ConnectionHandler: import IPRSocket directly to fix isinstance check
Recent change in pyroute2 introduced partial proxy to postpone the import,
on the downside this broke isinstance() check within LNST that did
comparison of unresolved IPRSocket object. More details in
https://github.com/svinota/pyroute2/issues/109
To do the check we can import the class directly from the lower pyroute2
module as suggested by Pete Saveliev.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst/Common/ConnectionHandler.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/lnst/Common/ConnectionHandler.py b/lnst/Common/ConnectionHandler.py
index 36349dc..8beaafc 100644
--- a/lnst/Common/ConnectionHandler.py
+++ b/lnst/Common/ConnectionHandler.py
@@ -15,7 +15,7 @@ import select
import cPickle
import socket
from _multiprocessing import Connection
-from pyroute2 import IPRSocket
+from pyroute2.netlink.rtnl import IPRSocket
def send_data(s, data):
try:
9 years, 1 month
[PATCH] ConnectionHandler: import IPRSocket directly to fix isinstance check
by Jan Tluka
Recent change in pyroute2 introduced partial proxy to postpone the import,
on the downside this broke isinstance() check within LNST that did
comparison of unresolved IPRSocket object. More details in
https://github.com/svinota/pyroute2/issues/109
To do the check we can import the class directly from the lower pyroute2
module as suggested by Pete Saveliev.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
lnst/Common/ConnectionHandler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lnst/Common/ConnectionHandler.py b/lnst/Common/ConnectionHandler.py
index 36349dc..8beaafc 100644
--- a/lnst/Common/ConnectionHandler.py
+++ b/lnst/Common/ConnectionHandler.py
@@ -15,7 +15,7 @@ import select
import cPickle
import socket
from _multiprocessing import Connection
-from pyroute2 import IPRSocket
+from pyroute2.netlink.rtnl import IPRSocket
def send_data(s, data):
try:
--
1.9.3
9 years, 1 month
[PATCH] RFC on the following patch
by Ondrej Lichtner
From: Ondrej Lichtner <olichtne(a)redhat.com>
Before applying the following patch, please review and provide feedback if it
makes sense...
Ondrej Lichtner (1):
NetTestCommand: fix signal handling for bg commands
lnst/Common/NetTestCommand.py | 13 +---
lnst/Common/TestsCommon.py | 14 ++--
regression-tests/tests/25/lnst-ctl.conf | 2 -
regression-tests/tests/25/recipe2.xml | 20 +++---
regression-tests/tests/25/recipe3.xml | 53 ---------------
regression-tests/tests/25/run.sh | 9 +--
regression-tests/tests/25/test_modules/IcmpPing.py | 75 ----------------------
7 files changed, 21 insertions(+), 165 deletions(-)
delete mode 100644 regression-tests/tests/25/lnst-ctl.conf
delete mode 100644 regression-tests/tests/25/recipe3.xml
delete mode 100644 regression-tests/tests/25/test_modules/IcmpPing.py
--
2.1.0
9 years, 1 month
