Separate travis server and client tests

.travis.yml

@@ -11,6 +11,10 @@ php:
     - 7.4
     - nightly
 
+env:
+    - ABTEST=client
+    - ABTEST=server
+
 matrix:
     allow_failures:
         - php: nightly

tests/AbResultsTest.php

@@ -1,7 +1,9 @@
 <?php
-namespace Ratchet\RFC6455\Test;
 
-class AbResultsTest extends \PHPUnit_Framework_TestCase {
+namespace Ratchet\RFC6455\Test;
+use PHPUnit\Framework\TestCase;
+
+class AbResultsTest extends TestCase {
     private function verifyAutobahnResults($fileName) {
         if (!file_exists($fileName)) {
             return $this->markTestSkipped('Autobahn TestSuite results not found');

tests/ab/run_ab_tests.sh

@@ -9,48 +9,50 @@ if [ $(phpenv version-name) = "hhvm" -o $(phpenv version-name) = "5.4" -o $(phpe
 fi
 fi
 
-docker run --rm \
+if [ "$ABTEST" = "client" ]; then
-    -d \
+  docker run --rm \
-    -v ${PWD}:/config \
+      -d \
-    -v ${PWD}/reports:/reports \
+      -v ${PWD}:/config \
-    -p 9001:9001 \
+      -v ${PWD}/reports:/reports \
-    --name fuzzingserver \
+      -p 9001:9001 \
-    crossbario/autobahn-testsuite wstest -m fuzzingserver -s /config/fuzzingserver$SKIP_DEFLATE.json
+      --name fuzzingserver \
-sleep 5
+      crossbario/autobahn-testsuite wstest -m fuzzingserver -s /config/fuzzingserver$SKIP_DEFLATE.json
-if [ "$TRAVIS" != "true" ]; then
+  sleep 5
-    echo "Running tests vs Autobahn test client"
+  if [ "$TRAVIS" != "true" ]; then
-    ###docker run -it --rm --name abpytest crossbario/autobahn-testsuite wstest --mode testeeclient -w ws://host.docker.internal:9001
+      echo "Running tests vs Autobahn test client"
-fi
+      ###docker run -it --rm --name abpytest crossbario/autobahn-testsuite wstest --mode testeeclient -w ws://host.docker.internal:9001
-php -d memory_limit=256M clientRunner.php
+  fi
+  php -d memory_limit=256M clientRunner.php
 
-docker ps -a
+  docker ps -a
 
-docker logs fuzzingserver
+  docker logs fuzzingserver
 
-docker stop fuzzingserver
+  docker stop fuzzingserver
 
-
+  sleep 2
-
-sleep 2
-
-php -d memory_limit=256M startServer.php &
-sleep 3
-
-if [ "$OSTYPE" = "linux-gnu" ]; then
-  IPADDR=`hostname -I | cut -f 1 -d ' '`
-else
-  IPADDR=`ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}' | head -1 | tr -d 'adr:'`
 fi
 
-docker run --rm \
+if [ "$ABTEST" = "server" ]; then
-    -it \
+  php -d memory_limit=256M startServer.php &
-    -v ${PWD}:/config \
+  sleep 3
-    -v ${PWD}/reports:/reports \
-    --name fuzzingclient \
-    crossbario/autobahn-testsuite /bin/sh -c "sh /config/docker_bootstrap.sh $IPADDR; wstest -m fuzzingclient -s /config/fuzzingclient$SKIP_DEFLATE.json"
-sleep 1
 
-# send the shutdown command to the PHP echo server
+  if [ "$OSTYPE" = "linux-gnu" ]; then
-wget -O - -q http://127.0.0.1:9001/shutdown
+    IPADDR=`hostname -I | cut -f 1 -d ' '`
+  else
+    IPADDR=`ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}' | head -1 | tr -d 'adr:'`
+  fi
+
+  docker run --rm \
+      -it \
+      -v ${PWD}:/config \
+      -v ${PWD}/reports:/reports \
+      --name fuzzingclient \
+      crossbario/autobahn-testsuite /bin/sh -c "sh /config/docker_bootstrap.sh $IPADDR; wstest -m fuzzingclient -s /config/fuzzingclient$SKIP_DEFLATE.json"
+  sleep 1
+
+  # send the shutdown command to the PHP echo server
+  wget -O - -q http://127.0.0.1:9001/shutdown
+fi
 
 

tests/unit/Handshake/PermessageDeflateOptionsTest.php

@@ -3,8 +3,9 @@
 namespace Ratchet\RFC6455\Test\Unit\Handshake;
 
 use Ratchet\RFC6455\Handshake\PermessageDeflateOptions;
+use PHPUnit\Framework\TestCase;
 
-class PermessageDeflateOptionsTest extends \PHPUnit_Framework_TestCase
+class PermessageDeflateOptionsTest extends TestCase
 {
     public static function versionSupportProvider() {
         return [

tests/unit/Handshake/RequestVerifierTest.php

@@ -1,17 +1,20 @@
 <?php
+
 namespace Ratchet\RFC6455\Test\Unit\Handshake;
+
 use Ratchet\RFC6455\Handshake\RequestVerifier;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers Ratchet\RFC6455\Handshake\RequestVerifier
  */
-class RequestVerifierTest extends \PHPUnit_Framework_TestCase {
+class RequestVerifierTest extends TestCase {
     /**
      * @var RequestVerifier
      */
     protected $_v;
 
-    public function setUp() {
+    public function setUp() : void {
         $this->_v = new RequestVerifier();
     }
 

tests/unit/Handshake/ResponseVerifierTest.php

@@ -1,17 +1,20 @@
 <?php
+
 namespace Ratchet\RFC6455\Test\Unit\Handshake;
+
 use Ratchet\RFC6455\Handshake\ResponseVerifier;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers Ratchet\RFC6455\Handshake\ResponseVerifier
  */
-class ResponseVerifierTest extends \PHPUnit_Framework_TestCase {
+class ResponseVerifierTest extends TestCase {
     /**
      * @var ResponseVerifier
      */
     protected $_v;
 
-    public function setUp() {
+    public function setUp() : void {
         $this->_v = new ResponseVerifier;
     }
 

tests/unit/Handshake/ServerNegotiatorTest.php

@@ -4,8 +4,9 @@ namespace Ratchet\RFC6455\Test\Unit\Handshake;
 
 use Ratchet\RFC6455\Handshake\RequestVerifier;
 use Ratchet\RFC6455\Handshake\ServerNegotiator;
+use PHPUnit\Framework\TestCase;
 
-class ServerNegotiatorTest extends \PHPUnit_Framework_TestCase
+class ServerNegotiatorTest extends TestCase
 {
     public function testNoUpgradeRequested() {
         $negotiator = new ServerNegotiator(new RequestVerifier());

tests/unit/Messaging/FrameTest.php

@@ -1,13 +1,16 @@
 <?php
+
 namespace Ratchet\RFC6455\Test\Unit\Messaging;
+
 use Ratchet\RFC6455\Messaging\Frame;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers Ratchet\RFC6455\Messaging\Frame
  * @todo getMaskingKey, getPayloadStartingByte don't have tests yet
  * @todo Could use some clean up in general, I had to rush to fix a bug for a deadline, sorry.
  */
-class FrameTest extends \PHPUnit_Framework_TestCase {
+class FrameTest extends TestCase {
     protected $_firstByteFinText    = '10000001';
 
     protected $_secondByteMaskedSPL = '11111101';

tests/unit/Messaging/MessageBufferTest.php

@@ -7,8 +7,9 @@ use Ratchet\RFC6455\Messaging\Frame;
 use Ratchet\RFC6455\Messaging\Message;
 use Ratchet\RFC6455\Messaging\MessageBuffer;
 use React\EventLoop\Factory;
+use PHPUnit\Framework\TestCase;
 
-class MessageBufferTest extends \PHPUnit_Framework_TestCase
+class MessageBufferTest extends TestCase
 {
     /**
      * This is to test that MessageBuffer can handle a large receive

tests/unit/Messaging/MessageTest.php

@@ -1,12 +1,15 @@
 <?php
+
 namespace Ratchet\RFC6455\Test\Unit\Messaging;
+
 use Ratchet\RFC6455\Messaging\Frame;
 use Ratchet\RFC6455\Messaging\Message;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers Ratchet\RFC6455\Messaging\Message
  */
-class MessageTest extends \PHPUnit_Framework_TestCase {
+class MessageTest extends TestCase {
     /** @var Message */
     protected $message;