Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #676 from gpotter2/fix-pypy-tests1 

Fix pipetools tests
This commit is contained in:
Guillaume Valadon 2017-06-07 08:44:41 +02:00 committed by GitHub
parent 3a2d7bb846 85e91cf2d0
commit f618886810
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/pipetool.uts
View File

@ -42,7 +42,6 @@ s > d1 > c
p = PipeEngine(s) p = PipeEngine(s)
p.start() p.start()
time.sleep(1)
p.wait_and_stop() p.wait_and_stop()
= Test add_pipe on running instance = Test add_pipe on running instance
@ -67,6 +66,7 @@ s > d1 > c
p.add(s) p.add(s)
time.sleep(1) time.sleep(1)
p.wait_and_stop() p.wait_and_stop()
assert test_val == "hello" assert test_val == "hello"
@ -130,7 +130,6 @@ p.list_pipes_detailed()
= Test RawConsoleSink with CLIFeeder = Test RawConsoleSink with CLIFeeder
p = PipeEngine() p = PipeEngine()
p.start()
s = CLIFeeder() s = CLIFeeder()
s.send("hello") s.send("hello")
@ -144,14 +143,14 @@ c._write_pipe = w
s > d1 > c s > d1 > c
p.add(s) p.add(s)
time.sleep(1) p.start()
p.wait_and_stop()
assert os.read(r, 20) == "hello\n" assert os.read(r, 20) == "hello\n"
p.wait_and_stop()
= Test QueueSink with CLIFeeder = Test QueueSink with CLIFeeder
p = PipeEngine() p = PipeEngine()
p.start()
s = CLIFeeder() s = CLIFeeder()
s.send("hello") s.send("hello")
@ -162,7 +161,8 @@ c = QueueSink(name="c")
s > d1 > c s > d1 > c
p.add(s) p.add(s)
time.sleep(1) p.start()
p.wait_and_stop() p.wait_and_stop()
assert c.recv() == "hello" assert c.recv() == "hello"
@ -176,7 +176,6 @@ class TestSink(Sink):
test_val = msg test_val = msg
p = PipeEngine() p = PipeEngine()
p.start()
s = CLIFeeder() s = CLIFeeder()
s.send("hello") s.send("hello")
@ -188,7 +187,8 @@ s > d1
d1 >> c d1 >> c
p.add(s) p.add(s)
time.sleep(1) p.start()
p.wait_and_stop() p.wait_and_stop()
assert test_val == "hello" assert test_val == "hello"
@ -202,7 +202,6 @@ class TestSink(Sink):
test_val = msg test_val = msg
p = PipeEngine() p = PipeEngine()
p.start()
s = CLIHighFeeder() s = CLIHighFeeder()
s.send("hello") s.send("hello")
@ -214,6 +213,7 @@ s >> d1
d1 > c d1 > c
p.add(s) p.add(s)
time.sleep(1) p.start()
p.wait_and_stop() p.wait_and_stop()
assert test_val == "hello" assert test_val == "hello"