From b9e75ed087b3a8a501d54cee5fda4f20b30ca1d3 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 7 Jul 2017 20:19:19 +0200 Subject: [PATCH 1/2] Generate password on the fly --- .travis.yml | 6 +++++- README.md | 10 +++++++++- composer.json | 3 +-- tests/BaseTestCase.php | 6 ++++-- tests/StreamTest.php | 3 ++- tests/server/ssl/ca.pem | 19 ------------------- tests/server/ssl/client-and-key.pem | 29 ----------------------------- tests/server/ssl/client.key | 15 --------------- tests/server/ssl/client.pem | 14 -------------- tests/server/ssl/client.req | 11 ----------- tests/server/ssl/file.srl | 2 +- tests/server/ssl/generate.sh | 13 ++++++------- tests/server/ssl/privkey.pem | 18 ------------------ tests/server/ssl/server-and-key.pem | 29 ----------------------------- tests/server/ssl/server.key | 15 --------------- tests/server/ssl/server.pem | 14 -------------- tests/server/ssl/server.req | 11 ----------- 17 files changed, 28 insertions(+), 190 deletions(-) delete mode 100644 tests/server/ssl/ca.pem delete mode 100644 tests/server/ssl/client-and-key.pem delete mode 100644 tests/server/ssl/client.key delete mode 100644 tests/server/ssl/client.pem delete mode 100644 tests/server/ssl/client.req delete mode 100644 tests/server/ssl/privkey.pem delete mode 100644 tests/server/ssl/server-and-key.pem delete mode 100644 tests/server/ssl/server.key delete mode 100644 tests/server/ssl/server.pem delete mode 100644 tests/server/ssl/server.req diff --git a/.travis.yml b/.travis.yml index a820d0c..157e9dd 100644 --- a/.travis.yml +++ b/.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 "" diff --git a/README.md b/README.md index 392f655..d5620f4 100644 --- a/README.md +++ b/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 diff --git a/composer.json b/composer.json index 3f4e9bb..a1e5f8c 100644 --- a/composer.json +++ b/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" }, diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php index d049251..dc1fa13 100644 --- a/tests/BaseTestCase.php +++ b/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); + usleep(300000); } public function stopServer($name) diff --git a/tests/StreamTest.php b/tests/StreamTest.php index 9d5ea10..910c6e2 100644 --- a/tests/StreamTest.php +++ b/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) { diff --git a/tests/server/ssl/ca.pem b/tests/server/ssl/ca.pem deleted file mode 100644 index aa477d0..0000000 --- a/tests/server/ssl/ca.pem +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDBDCCAm2gAwIBAgIJAKf70F8G74WBMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNV -BAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJhbmNlMQ4wDAYDVQQHEwVQYXJpczER -MA8GA1UEChMIUEhQLUhUVFAxFjAUBgNVBAMTDXNvY2tldC1zZXJ2ZXIwHhcNMTYw -NzE4MTAwMDIzWhcNMTYwODE3MTAwMDIzWjBgMQswCQYDVQQGEwJGUjEWMBQGA1UE -CBMNSWxlLWRlLUZyYW5jZTEOMAwGA1UEBxMFUGFyaXMxETAPBgNVBAoTCFBIUC1I -VFRQMRYwFAYDVQQDEw1zb2NrZXQtc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GN -ADCBiQKBgQDZbuJ4bebB+9mER7bHl2kizLWP0gWwv5l0Kvr2m0ajZ7MZpxH19Hmo -I5XXIdnM3JSIajW8+FZ23z4s1FawRrn9EnJc/o0KP7NB0yREcO3XiuqAo5K8gkFA -wQPeaxl1JDpAVjKPAfP35bnMoIz55MW/UJXH+QBv1/95T3r9xvX+PQIDAQABo4HF -MIHCMB0GA1UdDgQWBBQpMG5EbNuv8sNLO/MbPbyp3DMLezCBkgYDVR0jBIGKMIGH -gBQpMG5EbNuv8sNLO/MbPbyp3DMLe6FkpGIwYDELMAkGA1UEBhMCRlIxFjAUBgNV -BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt -SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcoIJAKf70F8G74WBMAwGA1UdEwQF -MAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAFfJlrEhQ4o1sroNsq/gWBP9rg4jzU4Bm -HcWieWQyWg5sXNCJgCr9ntZ4w29POtlIpHXCoH3UnEDEq7BXGiVRd7vAbxKn6Yt/ -+oKTxvcmBNXkkOgEbH/3uD2sGkcfndYkJieRGcUr69wThhjSxfgUE1Gnynjl7SIF -UlZlufPto3I= ------END CERTIFICATE----- diff --git a/tests/server/ssl/client-and-key.pem b/tests/server/ssl/client-and-key.pem deleted file mode 100644 index fb27231..0000000 --- a/tests/server/ssl/client-and-key.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNzCCAaACASowDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV -BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt -SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNjA3MTgxMDAwMzFaFw0x -NjA4MTcxMDAwMzFaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh -bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxHjAcBgNVBAMT -FXNvY2tldC1hZGFwdGVyLWNsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC -gYEA4iXSjiZWYKmGfEluM0z+bY6r2AGaZgApvOehQMjom1mORllMVkfIanuenbQE -ay9UIihRCO9gYZpFTSDt8Mgobl8x1i9gGd1bFf5Vy/9fubBD0k8Sss3GHNfTe5az -mls7D8pqTD7KOdBe1000DmpNKbV4b5WZGI/dsliUqvEQJDcCAwEAATANBgkqhkiG -9w0BAQUFAAOBgQDRjvy010S62JD20ZrK60svmqI6Z9a3jJ6dVmWS1YM1u8DRrUKf -StsEbIuNMuLmdGQ9FDoLuURuzuqtYlsKyjnUq7oyjq8xeIKr2oAPxftwBBeEydQF -7GBcdokMOMWl9bGLI7YMbRiqyshw8y/rqVCAF+5/65jhPMJuPEPVa2pCJQ== ------END CERTIFICATE----- ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDiJdKOJlZgqYZ8SW4zTP5tjqvYAZpmACm856FAyOibWY5GWUxW -R8hqe56dtARrL1QiKFEI72BhmkVNIO3wyChuXzHWL2AZ3VsV/lXL/1+5sEPSTxKy -zcYc19N7lrOaWzsPympMPso50F7XTTQOak0ptXhvlZkYj92yWJSq8RAkNwIDAQAB -AoGBAKR3eU+kFgGqiIHvLVPl1Mt8jQFE+TLhP3mAw0dIVdJVKSGEY/4Dqn+2c76h -Yu1IuFk3FOf4nxGcjnXvUtxf1PZB/t1xHMHuspYHkc9ElDQDfuYqgimAPzMHsUfm -St47YNNLA6pzPUtpaw7qRA7v54y8qi3GdHf4pLW1/PSuuoLhAkEA9T62mody3EDG -33jks1vCGoFtADlU3J2ShJiFG44HsWueJ933KRgP2NlAwtumO+Om4CaUUzIiOSzT -uibjOEyl7wJBAOwQtfERZfvpVLoqVF9NADvy4KpGbv+lXq9gTia9hSMumH2h5+Jh -nVXhN9m/TRQiQ74XB3tpC0I5H4fozCj17jkCQQDY/gNN2Vjc3wfYBTy+IgstrqTG -VPPsPBO+9MCZr+LIrgMDHVeqaZrj8N5nSzfbt8MYg6orrqkvU6WHCQ906gTLAkAc -6dMPCr1+BE8vWh3pakn8Dbx8vpG72Cpnupj338Cd1Ygx4xG+xYv6x9IKZobvT18S -ukldUTlizBJTmCzhW3XpAkEA5tYfC72Ia761g6ild8HaILMK30+wYCWIu3Ieb+G1 -uaJWO+VDKKtWVntkPfnckVlfPQMmuMDaIGh9G2vWRYdtDQ== ------END RSA PRIVATE KEY----- diff --git a/tests/server/ssl/client.key b/tests/server/ssl/client.key deleted file mode 100644 index 8f7d7c7..0000000 --- a/tests/server/ssl/client.key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDiJdKOJlZgqYZ8SW4zTP5tjqvYAZpmACm856FAyOibWY5GWUxW -R8hqe56dtARrL1QiKFEI72BhmkVNIO3wyChuXzHWL2AZ3VsV/lXL/1+5sEPSTxKy -zcYc19N7lrOaWzsPympMPso50F7XTTQOak0ptXhvlZkYj92yWJSq8RAkNwIDAQAB -AoGBAKR3eU+kFgGqiIHvLVPl1Mt8jQFE+TLhP3mAw0dIVdJVKSGEY/4Dqn+2c76h -Yu1IuFk3FOf4nxGcjnXvUtxf1PZB/t1xHMHuspYHkc9ElDQDfuYqgimAPzMHsUfm -St47YNNLA6pzPUtpaw7qRA7v54y8qi3GdHf4pLW1/PSuuoLhAkEA9T62mody3EDG -33jks1vCGoFtADlU3J2ShJiFG44HsWueJ933KRgP2NlAwtumO+Om4CaUUzIiOSzT -uibjOEyl7wJBAOwQtfERZfvpVLoqVF9NADvy4KpGbv+lXq9gTia9hSMumH2h5+Jh -nVXhN9m/TRQiQ74XB3tpC0I5H4fozCj17jkCQQDY/gNN2Vjc3wfYBTy+IgstrqTG -VPPsPBO+9MCZr+LIrgMDHVeqaZrj8N5nSzfbt8MYg6orrqkvU6WHCQ906gTLAkAc -6dMPCr1+BE8vWh3pakn8Dbx8vpG72Cpnupj338Cd1Ygx4xG+xYv6x9IKZobvT18S -ukldUTlizBJTmCzhW3XpAkEA5tYfC72Ia761g6ild8HaILMK30+wYCWIu3Ieb+G1 -uaJWO+VDKKtWVntkPfnckVlfPQMmuMDaIGh9G2vWRYdtDQ== ------END RSA PRIVATE KEY----- diff --git a/tests/server/ssl/client.pem b/tests/server/ssl/client.pem deleted file mode 100644 index 801a918..0000000 --- a/tests/server/ssl/client.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICNzCCAaACASowDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV -BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt -SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNjA3MTgxMDAwMzFaFw0x -NjA4MTcxMDAwMzFaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh -bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxHjAcBgNVBAMT -FXNvY2tldC1hZGFwdGVyLWNsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC -gYEA4iXSjiZWYKmGfEluM0z+bY6r2AGaZgApvOehQMjom1mORllMVkfIanuenbQE -ay9UIihRCO9gYZpFTSDt8Mgobl8x1i9gGd1bFf5Vy/9fubBD0k8Sss3GHNfTe5az -mls7D8pqTD7KOdBe1000DmpNKbV4b5WZGI/dsliUqvEQJDcCAwEAATANBgkqhkiG -9w0BAQUFAAOBgQDRjvy010S62JD20ZrK60svmqI6Z9a3jJ6dVmWS1YM1u8DRrUKf -StsEbIuNMuLmdGQ9FDoLuURuzuqtYlsKyjnUq7oyjq8xeIKr2oAPxftwBBeEydQF -7GBcdokMOMWl9bGLI7YMbRiqyshw8y/rqVCAF+5/65jhPMJuPEPVa2pCJQ== ------END CERTIFICATE----- diff --git a/tests/server/ssl/client.req b/tests/server/ssl/client.req deleted file mode 100644 index 545173d..0000000 --- a/tests/server/ssl/client.req +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIBqDCCARECAQAwaDELMAkGA1UEBhMCRlIxFjAUBgNVBAgTDUlsZS1kZS1GcmFu -Y2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAtSFRUUDEeMBwGA1UEAxMV -c29ja2V0LWFkYXB0ZXItY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB -gQDiJdKOJlZgqYZ8SW4zTP5tjqvYAZpmACm856FAyOibWY5GWUxWR8hqe56dtARr -L1QiKFEI72BhmkVNIO3wyChuXzHWL2AZ3VsV/lXL/1+5sEPSTxKyzcYc19N7lrOa -WzsPympMPso50F7XTTQOak0ptXhvlZkYj92yWJSq8RAkNwIDAQABoAAwDQYJKoZI -hvcNAQEFBQADgYEA3G8c/4gB/eEme+1U99SKZlxHGzKhj28Qz9aiunfGRVnPDgnF -wFrnah8KjBwAv2Eh58SwTomenSYtpuuuT6W3YQ4YGn5BtoTb2l4qpW8cncqQR5Bq -g91l/fXtuZKU5hSOkI5vAKCsHY3Z+R8Raxxd0s6pzeca+qkkEmUmKedEnPM= ------END CERTIFICATE REQUEST----- diff --git a/tests/server/ssl/file.srl b/tests/server/ssl/file.srl index 8676c24..fe909bb 100644 --- a/tests/server/ssl/file.srl +++ b/tests/server/ssl/file.srl @@ -1 +1 @@ -2A +2D diff --git a/tests/server/ssl/generate.sh b/tests/server/ssl/generate.sh index b99f4b4..696b340 100755 --- a/tests/server/ssl/generate.sh +++ b/tests/server/ssl/generate.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash C=FR ST=Ile-de-France @@ -6,15 +6,14 @@ 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 diff --git a/tests/server/ssl/privkey.pem b/tests/server/ssl/privkey.pem deleted file mode 100644 index 31c9834..0000000 --- a/tests/server/ssl/privkey.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,7BB9811913388905 - -UHN46XyFU48x2IQAkYjrLDzcFLU6xZh1rPGYgIEy6Dacg6QqxO90Nlm2GD8phvY6 -UVj2E2S3GlviBegs/8AJtJ3Ly9LFGKoM5zFrQ24zPp1QAKqMhLBpbq/iFi6oyWv4 -cEB2d7fBZETtg1ZXhvjzS9muvc3uZfIALmoPxWlTYv0m4ErE4GBezKO+Y7Mexl6U -K9Mg0fAXNW8GQsUpqjs+9IA/COS7GKsHRKV7Bk0Ar/Kd/xjFBv0Vf4mdyYe/fAu1 -ary20XZsYNsO/RdfUtWMzsTKfnMgG1csQcO7xgYHGKHC6U+35yjxwmQxw7F3xP4W -8i5t2J3QfnX9PlnYOLTYucj74na+U6raE2S+ejO3YDF8nIpJaDvzpA4N35T4hDDL -Z/SpFtol8Uf33GuH/uiz7x2ss7vyPe1hk96nirT14Bsx1ZEczua/CCTs+iQtoB5F -breSVhlyMCq6rC47xd69IYVnyEe11EigHn/sQkdUae3kjqL4pgMGBdlONuV63gmX -yNSFIaE+gh0mFnOVdCtiFxS8XP5BkJ11IcSLIG4ZygycX/IOTRQFh/TTJ4HYDcPZ -j3zJvZm/OI8xiq5jhEqfkgJElQd/pFuLHESEa8+Q4wiOhYwQEBjKDIBboWXF8CDE -QFIVBf/o+w3YN700p0xKjGqhaPnKQwCEfY5Lh44pPf7yQX7LiE8tG9kqAfEu25Dc -kYl1Rw8SFP6OVLqCNMjRTKeyFubkoAFXz828dzZdGd6H8zPH51FqsxIqJepwH6sT -NWHvnX5LwC5mblF4+VSc7TTgaE16Nq/g1oEXNBuZS6oJq2OnwtH4yQ== ------END RSA PRIVATE KEY----- diff --git a/tests/server/ssl/server-and-key.pem b/tests/server/ssl/server-and-key.pem deleted file mode 100644 index bd112d2..0000000 --- a/tests/server/ssl/server-and-key.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICMDCCAZkCASkwDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV -BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt -SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNjA3MTgxMDAwMjhaFw0x -NjA4MTcxMDAwMjhaMGExCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh -bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxFzAVBgNVBAMT -DnNvY2tldC1hZGFwdGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZHYLV -1mpoiG2AW5VebIB0nCaT8EIryeUk57swa5nqW9fj/KD4hIaoz19Ivt7/LrVTCOag -jFiwEcm4kEC8h0DJvW2IKNDWIpObHBSFFFOlLxhJkq+US1CJjKgSDvU5X3ElXb99 -L1EHN/+M8ZA4Qw3fFAbO2ajENeoxHH9KKZCQLQIDAQABMA0GCSqGSIb3DQEBBQUA -A4GBAM1TFIPTwbG0x//yMhPD9ZGWb2mYfA00Lri198YVmG61PtgDI5hG2dxaDVDa -6Ig6DnrwTBMc51p+NiTgci3OqnJ4FuwBdY5d1moyQre0MHr+sg8STJr5tmAEithL -GUGq3Uv3RuN3OetaPrlxaccJM1nB63caoH5Rl+VqAsJ4S4LI ------END CERTIFICATE----- ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDZHYLV1mpoiG2AW5VebIB0nCaT8EIryeUk57swa5nqW9fj/KD4 -hIaoz19Ivt7/LrVTCOagjFiwEcm4kEC8h0DJvW2IKNDWIpObHBSFFFOlLxhJkq+U -S1CJjKgSDvU5X3ElXb99L1EHN/+M8ZA4Qw3fFAbO2ajENeoxHH9KKZCQLQIDAQAB -AoGAHcaqVuFdHpD3U4874QNIarWvpMJikNbTkkglp/JZ3YZTCXVwLiUewrAOBVAI -DT8+pvClkIcu8pa97435EuIJxGB9C0Nudzpknm3xucc1pfYsq9fIa6F/+xTBIaTu -3FcA1vJ/fodhcPPwp6CAQJV7pLfQ5m+DLuwp5ICyy5v2yRECQQD0YgkbGLyKIM0K -qcNbDE3fNrRQ99ydQ1QXrB+4M8Lc/49XLvd5l9QwMN6BHvEpGf4qvBUYBFYroSVs -wogOWfmvAkEA42+lxrETE7mIJ/h+QDAQ6JX9fUuda96YU7Xs7OaRWAc77RazxP2p -XTV1U9l+FHpAvdauWgi7h+0zCEfbjEb24wJBALDJ4vB5OptqEyqtmKdbBVJ+zn7s -b+pMdJ8TY3br6wHY1qcpUNnjnhqmn7Ak5CzpotbjbRcMvBGf5+T/7VEEgf0CQGlE -/hgvUcMpdun5TIZtOQZOllvuKdkJ2Lu2Uwl71v5FqukcPu0I8+FeowXCf2b/BwRX -X6/wpsxNb/d/OxF8rz0CQQDPPxYM5+FSFzun831QSfxWwGx2LLFPQKYmixKfwpQB -3eIq3gPYN3A/qlVCZlGhyKLH2WiW/bY3HTQ4ZSCgTYzd ------END RSA PRIVATE KEY----- diff --git a/tests/server/ssl/server.key b/tests/server/ssl/server.key deleted file mode 100644 index 5a49a70..0000000 --- a/tests/server/ssl/server.key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDZHYLV1mpoiG2AW5VebIB0nCaT8EIryeUk57swa5nqW9fj/KD4 -hIaoz19Ivt7/LrVTCOagjFiwEcm4kEC8h0DJvW2IKNDWIpObHBSFFFOlLxhJkq+U -S1CJjKgSDvU5X3ElXb99L1EHN/+M8ZA4Qw3fFAbO2ajENeoxHH9KKZCQLQIDAQAB -AoGAHcaqVuFdHpD3U4874QNIarWvpMJikNbTkkglp/JZ3YZTCXVwLiUewrAOBVAI -DT8+pvClkIcu8pa97435EuIJxGB9C0Nudzpknm3xucc1pfYsq9fIa6F/+xTBIaTu -3FcA1vJ/fodhcPPwp6CAQJV7pLfQ5m+DLuwp5ICyy5v2yRECQQD0YgkbGLyKIM0K -qcNbDE3fNrRQ99ydQ1QXrB+4M8Lc/49XLvd5l9QwMN6BHvEpGf4qvBUYBFYroSVs -wogOWfmvAkEA42+lxrETE7mIJ/h+QDAQ6JX9fUuda96YU7Xs7OaRWAc77RazxP2p -XTV1U9l+FHpAvdauWgi7h+0zCEfbjEb24wJBALDJ4vB5OptqEyqtmKdbBVJ+zn7s -b+pMdJ8TY3br6wHY1qcpUNnjnhqmn7Ak5CzpotbjbRcMvBGf5+T/7VEEgf0CQGlE -/hgvUcMpdun5TIZtOQZOllvuKdkJ2Lu2Uwl71v5FqukcPu0I8+FeowXCf2b/BwRX -X6/wpsxNb/d/OxF8rz0CQQDPPxYM5+FSFzun831QSfxWwGx2LLFPQKYmixKfwpQB -3eIq3gPYN3A/qlVCZlGhyKLH2WiW/bY3HTQ4ZSCgTYzd ------END RSA PRIVATE KEY----- diff --git a/tests/server/ssl/server.pem b/tests/server/ssl/server.pem deleted file mode 100644 index 5c9542a..0000000 --- a/tests/server/ssl/server.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICMDCCAZkCASkwDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV -BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt -SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNjA3MTgxMDAwMjhaFw0x -NjA4MTcxMDAwMjhaMGExCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh -bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxFzAVBgNVBAMT -DnNvY2tldC1hZGFwdGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZHYLV -1mpoiG2AW5VebIB0nCaT8EIryeUk57swa5nqW9fj/KD4hIaoz19Ivt7/LrVTCOag -jFiwEcm4kEC8h0DJvW2IKNDWIpObHBSFFFOlLxhJkq+US1CJjKgSDvU5X3ElXb99 -L1EHN/+M8ZA4Qw3fFAbO2ajENeoxHH9KKZCQLQIDAQABMA0GCSqGSIb3DQEBBQUA -A4GBAM1TFIPTwbG0x//yMhPD9ZGWb2mYfA00Lri198YVmG61PtgDI5hG2dxaDVDa -6Ig6DnrwTBMc51p+NiTgci3OqnJ4FuwBdY5d1moyQre0MHr+sg8STJr5tmAEithL -GUGq3Uv3RuN3OetaPrlxaccJM1nB63caoH5Rl+VqAsJ4S4LI ------END CERTIFICATE----- diff --git a/tests/server/ssl/server.req b/tests/server/ssl/server.req deleted file mode 100644 index cc19ec7..0000000 --- a/tests/server/ssl/server.req +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIBoTCCAQoCAQAwYTELMAkGA1UEBhMCRlIxFjAUBgNVBAgTDUlsZS1kZS1GcmFu -Y2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAtSFRUUDEXMBUGA1UEAxMO -c29ja2V0LWFkYXB0ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANkdgtXW -amiIbYBblV5sgHScJpPwQivJ5STnuzBrmepb1+P8oPiEhqjPX0i+3v8utVMI5qCM -WLARybiQQLyHQMm9bYgo0NYik5scFIUUU6UvGEmSr5RLUImMqBIO9TlfcSVdv30v -UQc3/4zxkDhDDd8UBs7ZqMQ16jEcf0opkJAtAgMBAAGgADANBgkqhkiG9w0BAQUF -AAOBgQCWD+DqC2HAiKCZh5j1QdKbzVF2rNV0Gfn2RM/cswMGHEGQyqeI1JH6R3ec -Reo7XG7Sx/qswpr8SBe7TrgGhgHm1U9757+Vw2U64Mvm0m6MvW5+PIwvr1k+f1iD -zJsvFhdS0ijRKTerAhBO1rpw1A1O7a8zJP/g0mie2OE8PnWQPQ== ------END CERTIFICATE REQUEST----- From 74f0735b9043d30342a8689c5b32e1cccd232427 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Fri, 7 Jul 2017 21:29:44 +0200 Subject: [PATCH 2/2] Sleep for longer --- tests/BaseTestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php index dc1fa13..50b4fe3 100644 --- a/tests/BaseTestCase.php +++ b/tests/BaseTestCase.php @@ -13,7 +13,7 @@ public function startServer($name) $filename = __DIR__ . '/server/' . $name . '.php'; $pipes = []; $this->servers[$name] = proc_open('php '. $filename, [], $pipes); - usleep(300000); + sleep(1); } public function stopServer($name)