THRIFT-5145 Streamline --pipe and --named-pipe options in the code base
Client: Test suite
Patch: Jens Geyer
This closes #2065
diff --git a/lib/delphi/test/TestClient.pas b/lib/delphi/test/TestClient.pas
index 1579bd5..ff59982 100644
--- a/lib/delphi/test/TestClient.pas
+++ b/lib/delphi/test/TestClient.pas
@@ -196,7 +196,7 @@
+ ' --port arg (=9090) Port number to connect'#10
+ ' --domain-socket arg Domain Socket (e.g. /tmp/ThriftTest.thrift),'#10
+ ' instead of host and port'#10
- + ' --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)'#10
+ + ' --pipe arg Windows Named Pipe (e.g. MyThriftPipe)'#10
+ ' --anon-pipes hRead hWrite Windows Anonymous Pipes pair (handles)'#10
+ ' --transport arg (=sockets) Transport: buffered, framed, http, winhttp'#10
+ ' --protocol arg (=binary) Protocol: binary, compact, json'#10
@@ -268,8 +268,8 @@
// --domain-socket arg Domain Socket (e.g. /tmp/ThriftTest.thrift), instead of host and port
raise Exception.Create('domain-socket not supported');
end
- else if s = '--named-pipe' then begin
- // --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)
+ else if s = '--pipe' then begin
+ // --pipe arg Windows Named Pipe (e.g. MyThriftPipe)
setup.endpoint := trns_NamedPipes;
setup.sPipeName := args[i];
Inc( i);
diff --git a/lib/delphi/test/TestServer.pas b/lib/delphi/test/TestServer.pas
index bbc798b..f93c846 100644
--- a/lib/delphi/test/TestServer.pas
+++ b/lib/delphi/test/TestServer.pas
@@ -388,7 +388,7 @@
+ ' -h [ --help ] produce help message'#10
+ ' --port arg (=9090) Port number to listen'#10
+ ' --domain-socket arg Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)'#10
- + ' --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)'#10
+ + ' --pipe arg Windows Named Pipe (e.g. MyThriftPipe)'#10
+ ' --server-type arg (=simple) type of server, "simple", "thread-pool",'#10
+ ' "threaded", or "nonblocking"'#10
+ ' --transport arg (=socket) transport: buffered, framed, http, anonpipe'#10
@@ -503,10 +503,10 @@
// --domain-socket arg Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)
raise Exception.Create('domain-socket not supported');
end
- else if (s = '--named-pipe') then begin
- // --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)
+ else if (s = '--pipe') then begin
+ // --pipe arg Windows Named Pipe (e.g. MyThriftPipe)
endpoint := trns_NamedPipes;
- sPipeName := args[i]; // -pipe <name>
+ sPipeName := args[i]; // --pipe <name>
Inc( i );
end
else if (s = '--server-type') then begin
diff --git a/test/README.md b/test/README.md
index d5d1b92..5f6be15 100755
--- a/test/README.md
+++ b/test/README.md
@@ -126,7 +126,7 @@
-h | --help produce help message
--port=arg (9090) Port number to listen
--domain-socket=arg Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)
- --named-pipe=arg Windows Named Pipe (e.g. MyThriftPipe)
+ --pipe=arg Windows Named Pipe (e.g. MyThriftPipe)
--server-type=arg (simple) type of server, "simple", "thread-pool",
"threaded", or "nonblocking"
--transport=arg (buffered) transport: buffered, framed, http, anonpipe, zlib
@@ -149,7 +149,7 @@
--port=arg (9090) Port number to connect
--domain-socket=arg Domain Socket (e.g. /tmp/ThriftTest.thrift),
instead of host and port
- --named-pipe=arg Windows Named Pipe (e.g. MyThriftPipe)
+ --pipe=arg Windows Named Pipe (e.g. MyThriftPipe)
--anon-pipes hRead hWrite Windows Anonymous Pipes pair (handles)
--abstract-namespace Create the domain socket in the Abstract Namespace
(no connection with filesystem pathnames)
diff --git a/test/haxe/src/Arguments.hx b/test/haxe/src/Arguments.hx
index cc10749..56e5253 100644
--- a/test/haxe/src/Arguments.hx
+++ b/test/haxe/src/Arguments.hx
@@ -103,7 +103,7 @@
+" --port arg (=9090) Port number to listen / connect to\n"
/* not supported yet
+" --domain-socket arg Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)\n"
- +" --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)\n"
+ +" --pipe arg Windows Named Pipe (e.g. MyThriftPipe)\n"
*/
+" --protocol arg (=binary) protocol: binary, compact, json\n"
/* not supported yet
@@ -187,8 +187,8 @@
// --domain-socket arg Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)
throw "domain sockets not supported yet";
}
- else if (arg == "--named-pipe") {
- // --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)
+ else if (arg == "--pipe") {
+ // --pipe arg Windows Named Pipe (e.g. MyThriftPipe)
throw "named pipes not supported yet";
}
else if (arg == "--protocol") {
diff --git a/test/rs/src/bin/test_client.rs b/test/rs/src/bin/test_client.rs
index 8016ca6..5983c7d 100644
--- a/test/rs/src/bin/test_client.rs
+++ b/test/rs/src/bin/test_client.rs
@@ -54,7 +54,7 @@
fn run() -> thrift::Result<()> {
// unsupported options:
// --domain-socket
- // --named-pipe
+ // --pipe
// --anon-pipes
// --ssl
// --threads
diff --git a/test/rs/src/bin/test_server.rs b/test/rs/src/bin/test_server.rs
index 81c1ec7..d87ef75 100644
--- a/test/rs/src/bin/test_server.rs
+++ b/test/rs/src/bin/test_server.rs
@@ -57,7 +57,7 @@
// unsupported options:
// --domain-socket
- // --named-pipe
+ // --pipe
// --ssl
let matches = clap_app!(rust_test_client =>
(version: "1.0")