use print() - import print_function - should be fine for both py2 and py3

[nepi.git] / test / resources / linux / netns / netnsclient.py

diff --git a/test/resources/linux/netns/netnsclient.py b/test/resources/linux/netns/netnsclient.py
old mode 100644 (file)
new mode 100755 (executable)
index 447e92c..13823c9
--- a/test/resources/linux/netns/netnsclient.py
+++ b/test/resources/linux/netns/netnsclient.py
@@ -4,9 +4,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,11 +20,14 @@
 # Test based on netns test/test_core.py file test_run_ping_routing test
 #
 
+from __future__ import print_function
+
 from nepi.resources.netns.netnsserver import run_server
 from nepi.resources.linux.netns.netnsclient import LinuxNetNSClient
 
 from test_utils import skipIf
 
+import logging
 import os
 import threading
 import time
@@ -52,7 +54,7 @@ class LinuxNetNSClientTest(unittest.TestCase):
     @skipIf(os.getuid() != 0, "Test requires root privileges")
     def test_run_ping_routing(self):
         thread = threading.Thread(target = run_server,
-                args = [self.socket_name])
+                args = [self.socket_name], kwargs={"level":logging.DEBUG})
 
         thread.setDaemon(True)
         thread.start()
@@ -129,10 +131,10 @@ class LinuxNetNSClientTest(unittest.TestCase):
         #        nexthop = '10.0.0.2')
         #n3.add_route(prefix = '10.0.0.0', prefix_len = 24,
         #        nexthop = '10.0.1.1')
-        client.invoke(n1, "add_route", prefix = "10.0.1.0", prefix_len = 24,
-                nexthop = "10.0.0.2")
-        client.invoke(n3, "add_route", prefix = "10.0.0.0", prefix_len = 24,
-                nexthop = "10.0.1.1")
+        client.invoke(n1, "add_route", prefix="10.0.1.0", prefix_len=24,
+                nexthop="10.0.0.2")
+        client.invoke(n3, "add_route", prefix="10.0.0.0", prefix_len=24,
+                nexthop="10.0.1.1")
 
         ## launch pings
         #a1 = n1.Popen(['ping', '-qc1', '10.0.1.2'], stdout = null)
@@ -141,8 +143,8 @@ class LinuxNetNSClientTest(unittest.TestCase):
         path2 = "/tmp/netns_file2"
         file1 = client.create("open", path1, "w")
         file2 = client.create("open", path2, "w")
-        a1 = client.invoke(n1, "Popen", ["ping", "-qc1", "10.0.1.2"], stdout = file1)
-        a2 = client.invoke(n3, "Popen", ["ping", "-qc1", "10.0.0.1"], stdout = file2)
+        a1 = client.invoke(n1, "Popen", ["ping", "-qc1", "10.0.1.2"], stdout=file1)
+        a2 = client.invoke(n3, "Popen", ["ping", "-qc1", "10.0.0.1"], stdout=file2)
 
         ## get ping status
         p1 = None
@@ -157,7 +159,7 @@ class LinuxNetNSClientTest(unittest.TestCase):
         s1 = stdout1.read()
         s2 = stdout2.read()
 
-        print s1, s2
+        print(s1, s2)
 
         expected = "1 packets transmitted, 1 received, 0% packet loss"
         self.assertTrue(s1.find(expected) > -1)