Fixed broken master (#27)

* Generate password on the fly

* Sleep for longer

Author: Nyholm

.travis.yml

@@ -10,7 +10,7 @@ php:
     - 5.5
     - 5.6
     - 7.0
-    - hhvm
+    - 7.1
 
 env:
     global:
@@ -23,10 +23,13 @@ branches:
 matrix:
     allow_failures:
         - php: hhvm
+          dist: trusty
     fast_finish: true
     include:
         - php: 5.5
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
+        - php: hhvm
+          dist: trusty
 
 before_install:
     - travis_retry composer self-update
@@ -38,6 +41,7 @@ before_script:
     - vendor/bin/http_test_server > /dev/null 2>&1 &
 
 script:
+    - cd ./tests/server/ssl && ./generate.sh && pwd && ls -la && cd ../../../
     - $TEST_COMMAND
     - ./vendor/bin/phpunit tests/SocketClientFeatureTest.php --printer Http\\Client\\Tests\\FeatureTestListener || echo ""
 

README.md

@@ -28,7 +28,15 @@ First launch the http server:
 $ ./vendor/bin/http_test_server > /dev/null 2>&1 &
 ```
 
-Then the test suite:
+Then generate ssh certificates:
+
+```bash
+$ cd ./tests/server/ssl 
+$ ./generate.sh
+$ cd ../../../ 
+```
+
+Now run the test suite:
 
 ``` bash
 $ composer test

composer.json

@@ -16,9 +16,8 @@
         "php-http/discovery": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
         "guzzlehttp/psr7": "^1.2",
-        "php-http/client-integration-tests": "^0.5.1",
+        "php-http/client-integration-tests": "^0.6",
         "php-http/message": "^1.0",
         "php-http/client-common": "^1.0"
     },

tests/BaseTestCase.php

@@ -2,7 +2,9 @@
 
 namespace Http\Client\Socket\Tests;
 
-class BaseTestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class BaseTestCase extends TestCase
 {
     private $servers = [];
 
@@ -11,7 +13,7 @@ public function startServer($name)
         $filename = __DIR__ . '/server/' . $name . '.php';
         $pipes    = [];
         $this->servers[$name] = proc_open('php '. $filename, [], $pipes);
-        usleep(30000);
+        sleep(1);
     }
 
     public function stopServer($name)

tests/StreamTest.php

@@ -3,8 +3,9 @@
 namespace Http\Client\Socket\Tests;
 
 use Http\Client\Socket\Stream;
+use PHPUnit\Framework\TestCase;
 
-class StreamTest extends \PHPUnit_Framework_TestCase
+class StreamTest extends TestCase
 {
     public function createSocket($body, $useSize = true)
     {

tests/server/ssl/ca.pem

@@ -1 +1 @@
-2A
+2D

tests/server/ssl/client-and-key.pem

@@ -1,20 +1,19 @@
-#/bin/bash
+#!/bin/bash
 
 C=FR
 ST=Ile-de-France
 L=Paris
 O="PHP-HTTP"
 CN="socket-adapter"
 
-openssl req -out ca.pem -new -x509 -subj "/C=$C/ST=$ST/L=$L/O=$O/CN=socket-server"
-
+openssl req -out ca.pem -new -x509 -subj "/C=$C/ST=$ST/L=$L/O=$O/CN=socket-server" -passout pass:password
 openssl genrsa -out server.key 1024 -subj "/C=$C/ST=$ST/L=$L/O=$O/CN=socket-adapter"
-openssl req -key server.key -new -out server.req -subj "/C=$C/ST=$ST/L=$L/O=$O/CN=socket-adapter"
-openssl x509 -req -in server.req -CA ca.pem -CAkey privkey.pem -CAserial file.srl -out server.pem
+openssl req -key server.key -new -out server.req -subj "/C=$C/ST=$ST/L=$L/O=$O/CN=socket-adapter" -passout pass:password
+openssl x509 -req -in server.req -CA ca.pem -CAkey privkey.pem -CAserial file.srl -out server.pem -passin pass:password
 
 openssl genrsa -out client.key 1024 -subj "/C=$C/ST=$ST/L=$L/O=$O/CN=socket-adapter-client"
-openssl req -key client.key -new -out client.req -subj "/C=$C/ST=$ST/L=$L/O=$O/CN=socket-adapter-client"
-openssl x509 -req -in client.req -CA ca.pem -CAkey privkey.pem -CAserial file.srl -out client.pem
+openssl req -key client.key -new -out client.req -subj "/C=$C/ST=$ST/L=$L/O=$O/CN=socket-adapter-client" -passout pass:password
+openssl x509 -req -in client.req -CA ca.pem -CAkey privkey.pem -CAserial file.srl -out client.pem -passin pass:password
 
 cat client.pem client.key > client-and-key.pem
 cat server.pem server.key > server-and-key.pem