git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replacing assertEquals into assertEqual
[nepi.git]
/
test
/
resources
/
ns3
/
ns3wrapper.py
diff --git
a/test/resources/ns3/ns3wrapper.py
b/test/resources/ns3/ns3wrapper.py
index
7b6c487
..
2051fdd
100755
(executable)
--- a/
test/resources/ns3/ns3wrapper.py
+++ b/
test/resources/ns3/ns3wrapper.py
@@
-28,6
+28,7
@@
#
# node n0 sends IGMP traffic to node n3
#
# node n0 sends IGMP traffic to node n3
+from __future__ import print_function
from nepi.resources.ns3.ns3wrapper import NS3Wrapper
from nepi.resources.ns3.ns3wrapper import NS3Wrapper
@@
-180,10
+181,10
@@
class NS3WrapperTest(unittest.TestCase):
wrapper.invoke(csma, "EnableAsciiAll", "/tmp/csma-ping-ascii")
def SinkRx(packet, address):
wrapper.invoke(csma, "EnableAsciiAll", "/tmp/csma-ping-ascii")
def SinkRx(packet, address):
- print
packet
+ print
(packet)
def PingRtt(context, rtt):
def PingRtt(context, rtt):
- print
context, rtt
+ print
(context, rtt)
# XXX: No biding for MakeCallback
#Config::ConnectWithoutContext ("/NodeList/3/ApplicationList/0/$ns3::PacketSink/Rx",
# XXX: No biding for MakeCallback
#Config::ConnectWithoutContext ("/NodeList/3/ApplicationList/0/$ns3::PacketSink/Rx",
@@
-213,7
+214,7
@@
class NS3WrapperTest(unittest.TestCase):
stderr = subprocess.PIPE, shell = True)
(out, err) = p.communicate()
stderr = subprocess.PIPE, shell = True)
(out, err) = p.communicate()
- self.assertEqual
s
(int(out), 8)
+ self.assertEqual(int(out), 8)
p = subprocess.Popen("rm /tmp/csma-ping-*", shell = True)
p.communicate()
p = subprocess.Popen("rm /tmp/csma-ping-*", shell = True)
p.communicate()