From 3541db2dc7d2856b21204a46aaa696c3dc10b5fa Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Sat, 12 Mar 2016 10:29:26 -0500 Subject: [PATCH] Version indicators, remove UTF-8 disabling tests --- Makefile | 1 - src/Ratchet/ConnectionInterface.php | 2 +- tests/autobahn/bin/fuzzingserver-noutf8.php | 17 ----------------- tests/autobahn/fuzzingclient-all.json | 9 ++++----- 4 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 tests/autobahn/bin/fuzzingserver-noutf8.php diff --git a/Makefile b/Makefile index 4ec818f..e4af1d2 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,6 @@ cover: abtests: ulimit -n 2048 && php tests/autobahn/bin/fuzzingserver.php 8001 LibEvent & ulimit -n 2048 && php tests/autobahn/bin/fuzzingserver.php 8002 StreamSelect & - ulimit -n 2048 && php tests/autobahn/bin/fuzzingserver-noutf8.php 8003 StreamSelect & ulimit -n 2048 && php tests/autobahn/bin/fuzzingserver.php 8004 LibEv & wstest -m testeeserver -w ws://localhost:8000 & sleep 1 diff --git a/src/Ratchet/ConnectionInterface.php b/src/Ratchet/ConnectionInterface.php index 5c07a2d..8e2cee8 100644 --- a/src/Ratchet/ConnectionInterface.php +++ b/src/Ratchet/ConnectionInterface.php @@ -5,7 +5,7 @@ namespace Ratchet; * The version of Ratchet being used * @var string */ -const VERSION = 'Ratchet/0.3.4'; +const VERSION = 'Ratchet/0.4'; /** * A proxy object representing a connection to the application diff --git a/tests/autobahn/bin/fuzzingserver-noutf8.php b/tests/autobahn/bin/fuzzingserver-noutf8.php deleted file mode 100644 index 5ce1cb4..0000000 --- a/tests/autobahn/bin/fuzzingserver-noutf8.php +++ /dev/null @@ -1,17 +0,0 @@ - 1 ? $argv[1] : 8000; - $impl = sprintf('React\EventLoop\%sLoop', $argc > 2 ? $argv[2] : 'StreamSelect'); - - $loop = new $impl; - $sock = new React\Socket\Server($loop); - $web = new Ratchet\WebSocket\WsServer(new Ratchet\Server\EchoServer); - $app = new Ratchet\Http\HttpServer($web); - $web->setEncodingChecks(false); - - $sock->listen($port, '0.0.0.0'); - - $server = new Ratchet\Server\IoServer($app, $sock, $loop); - $server->run(); diff --git a/tests/autobahn/fuzzingclient-all.json b/tests/autobahn/fuzzingclient-all.json index dd9cddb..0494cf3 100644 --- a/tests/autobahn/fuzzingclient-all.json +++ b/tests/autobahn/fuzzingclient-all.json @@ -3,14 +3,13 @@ , "outdir": "reports/ab" , "servers": [ - {"agent": "Ratchet/0.3 libevent", "url": "ws://localhost:8001", "options": {"version": 18}} - , {"agent": "Ratchet/0.3 libev", "url": "ws://localhost:8004", "options": {"version": 18}} - , {"agent": "Ratchet/0.3 streams", "url": "ws://localhost:8002", "options": {"version": 18}} - , {"agent": "Ratchet/0.3 -utf8", "url": "ws://localhost:8003", "options": {"version": 18}} + {"agent": "Ratchet/0.4 libevent", "url": "ws://localhost:8001", "options": {"version": 18}} + , {"agent": "Ratchet/0.4 libev", "url": "ws://localhost:8004", "options": {"version": 18}} + , {"agent": "Ratchet/0.4 streams", "url": "ws://localhost:8002", "options": {"version": 18}} , {"agent": "AutobahnTestSuite/0.5.9", "url": "ws://localhost:8000", "options": {"version": 18}} ] , "cases": ["*"] - , "exclude-cases": ["1.2.*", "2.3", "2.4", "2.6", "9.2.*", "9.4.*", "9.6.*", "9.8.*"] + , "exclude-cases": [] , "exclude-agent-cases": {} }