Skip to content

Tests: Allow OpenSSL and mysqli tests to run in parallel #22472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LamentXU123 wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −32
Open

Tests: Allow OpenSSL and mysqli tests to run in parallel #22472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/mysqli/tests/mysqli_fetch_array_large.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
require_once 'skipifconnectfailure.inc';
?>
--CONFLICTS--
all
mysql
--INI--
memory_limit=-1
--FILE--
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (getenv("SKIP_SLOW_TESTS")) die('skip slow test');
require_once 'skipifconnectfailure.inc';
?>
--CONFLICTS--
all
mysql
--FILE--
<?php
require_once 'connect.inc';
Expand Down
1 change: 0 additions & 1 deletion ext/openssl/tests/CONFLICTS
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ext/openssl/tests/ServerClientTestCase.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function phpt_has_sslv3() {
if (!is_null($result)) {
return $result;
}
$server = @stream_socket_server('sslv3://127.0.0.1:10013');
$server = @stream_socket_server('sslv3://127.0.0.1:0');
if ($result = !!$server) {
fclose($server);
}
Expand Down
4 changes: 2 additions & 2 deletions ext/openssl/tests/gh20802.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $serverCode = <<<'CODE'
]
]
]);
$server = stream_socket_server('tls://127.0.0.1:12443', $errno, $errstr, $flags, $ctx);
$server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
phpt_notify_server_start($server);
stream_socket_accept($server, 3);
CODE;
Expand All @@ -42,7 +42,7 @@ $ctx = stream_context_create([
'verify_peer' => false
]
]);
@stream_socket_client("tls://127.0.0.1:12443", $errno, $errstr, 1, $flags, $ctx);
@stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
CODE;

include 'CertificateGenerator.inc';
Expand Down
4 changes: 2 additions & 2 deletions ext/openssl/tests/openssl_cms_verify_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if ($outfile === false) {

$contentfile = $outfile . ".out";

$pkcsfile = __DIR__ . "/openssl_cms_verify__pkcsfile.tmp";
$pkcsfile = __DIR__ . "/openssl_cms_verify_basic__pkcsfile.tmp";
$eml = __DIR__ . "/signed.eml";
$wrong = "wrong";
$empty = "";
Expand All @@ -38,7 +38,7 @@ if (file_exists($contentfile)) {
?>
--CLEAN--
<?php
unlink(__DIR__ . DIRECTORY_SEPARATOR . '/openssl_cms_verify__pkcsfile.tmp');
unlink(__DIR__ . DIRECTORY_SEPARATOR . '/openssl_cms_verify_basic__pkcsfile.tmp');
?>
--EXPECT--
bool(false)
Expand Down
4 changes: 2 additions & 2 deletions ext/openssl/tests/openssl_cms_verify_der.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if ($contentfile === false) {
die("failed to get a temporary filename!");
}

$pkcsfile = __DIR__ . "/openssl_cms_verify__pkcsfile.tmp";
$pkcsfile = __DIR__ . "/openssl_cms_verify_der__pkcsfile.tmp";
$eml = __DIR__ . "/signed.eml";
$wrong = "wrong";
$empty = "";
Expand Down Expand Up @@ -45,7 +45,7 @@ if (file_exists($contentfile)) {
?>
--CLEAN--
<?php
unlink(__DIR__ . DIRECTORY_SEPARATOR . '/openssl_cms_verify__pkcsfile.tmp');
unlink(__DIR__ . DIRECTORY_SEPARATOR . '/openssl_cms_verify_der__pkcsfile.tmp');
?>
--EXPECT--
bool(false)
Expand Down
4 changes: 2 additions & 2 deletions ext/openssl/tests/openssl_error_string_basic_openssl3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function dump_openssl_errors($name) {
}

// common output file
$output_file = __DIR__ . "/openssl_error_string_basic_output.tmp";
$output_file = __DIR__ . "/openssl_error_string_basic_openssl3_output.tmp";
// invalid file for read is something that does not exist in current directory
$invalid_file_for_read = __DIR__ . "/invalid_file_for_read_operation.txt";
// invalid file for is the test dir as writing file to existing dir should always fail
Expand Down Expand Up @@ -156,7 +156,7 @@ expect_openssl_errors('openssl_csr_get_subjec pem', [$err_pem_no_start_line]);
?>
--CLEAN--
<?php
$output_file = __DIR__ . "/openssl_error_string_basic_output.tmp";
$output_file = __DIR__ . "/openssl_error_string_basic_openssl3_output.tmp";
if (is_file($output_file)) {
unlink($output_file);
}
Expand Down
4 changes: 2 additions & 2 deletions ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ openssl_pkcs12_export_to_file() tests
openssl
--FILE--
<?php
$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file_basic__pkcsfile.tmp";

$cert_file = __DIR__ . "/public.crt";
$cert = file_get_contents($cert_file);
Expand Down Expand Up @@ -38,7 +38,7 @@ try {
?>
--CLEAN--
<?php
$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file_basic__pkcsfile.tmp";
if (file_exists($pkcsfile)) {
unlink($pkcsfile);
}
Expand Down
4 changes: 2 additions & 2 deletions ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ openssl_pkcs12_export_to_file() error tests
openssl
--FILE--
<?php
$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file_error__pkcsfile.tmp";

$cert_file = __DIR__ . "/public.crt";
$cert = file_get_contents($cert_file);
Expand All @@ -21,7 +21,7 @@ var_dump(openssl_pkcs12_export_to_file($cert, '.', $priv, $pass));
?>
--CLEAN--
<?php
$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
$pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file_error__pkcsfile.tmp";
if (file_exists($pkcsfile)) {
unlink($pkcsfile);
}
Expand Down
4 changes: 2 additions & 2 deletions ext/openssl/tests/session_resumption_import_export_session.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
?>
--FILE--
<?php
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize.pem.tmp';
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_import_export.pem.tmp';

$serverCode = <<<'CODE'
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
Expand Down Expand Up @@ -76,7 +76,7 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--CLEAN--
<?php
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize.pem.tmp');
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_import_export.pem.tmp');
?>
--EXPECTF--
string(%d) "-----BEGIN SSL SESSION PARAMETERS-----
Expand Down
4 changes: 0 additions & 4 deletions ext/openssl/tests/session_resumption_invalid_session_import.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,5 @@ try {
echo $e->getMessage() . "\n";
}
?>
--CLEAN--
<?php
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_cache_disabled.pem.tmp');
?>
--EXPECT--
Failed to import session data
4 changes: 2 additions & 2 deletions ext/openssl/tests/session_resumption_serialize_session.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
?>
--FILE--
<?php
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize.pem.tmp';
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize_session.pem.tmp';

$serverCode = <<<'CODE'
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
Expand Down Expand Up @@ -68,7 +68,7 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--CLEAN--
<?php
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize.pem.tmp');
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_resumption_serialize_session.pem.tmp');
?>
--EXPECTF--
string(%d) "O:15:"Openssl\Session":1:{s:3:"pem";s:%d:"-----BEGIN SSL SESSION PARAMETERS-----
Expand Down
4 changes: 2 additions & 2 deletions ext/openssl/tests/session_resumption_server_external_with_context_id.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
?>
--FILE--
<?php
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_external_proper.pem.tmp';
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_external_context_id.pem.tmp';

$serverCode = <<<'CODE'
$sessionStore = [];
Expand Down Expand Up @@ -105,7 +105,7 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--CLEAN--
<?php
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_external_proper.pem.tmp');
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_external_context_id.pem.tmp');
?>
--EXPECTF--
Client first connection resumed: no
Expand Down
4 changes: 2 additions & 2 deletions ext/openssl/tests/session_resumption_server_external_with_context_id_tls12.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
?>
--FILE--
<?php
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_external_proper.pem.tmp';
$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_external_context_id_tls12.pem.tmp';

$serverCode = <<<'CODE'
$sessionStore = [];
Expand Down Expand Up @@ -105,7 +105,7 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
?>
--CLEAN--
<?php
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_external_proper.pem.tmp');
@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_external_context_id_tls12.pem.tmp');
?>
--EXPECTF--
Client first connection resumed: no
Expand Down
8 changes: 4 additions & 4 deletions ext/openssl/tests/stream_server_reneg_limit.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_server_reneg_limit.pem.tmp';

$serverCode = <<<'CODE'
$printed = false;
$serverUri = "ssl://127.0.0.1:64321";
$serverUri = "ssl://127.0.0.1:0";
$serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
$serverCtx = stream_context_create(['ssl' => [
'local_cert' => '%s',
Expand All @@ -42,7 +42,7 @@ $serverCode = <<<'CODE'
]]);

$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
phpt_notify();
phpt_notify(message: stream_socket_get_name($server, false));

$clients = [];
while (1) {
Expand Down Expand Up @@ -71,9 +71,9 @@ CODE;
$serverCode = sprintf($serverCode, $certFile);

$clientCode = <<<'CODE'
phpt_wait();
$serverUri = trim(phpt_wait());

$cmd = 'openssl s_client -connect 127.0.0.1:64321';
$cmd = 'openssl s_client -connect ' . escapeshellarg($serverUri);
$descriptorSpec = [["pipe", "r"], ["pipe", "w"], ["pipe", "w"]];
$process = proc_open($cmd, $descriptorSpec, $pipes);

Expand Down
Loading