THRIFT-847 Test Framework harmonization across all languages
THRIFT-2946 Enhance usability of cross test framework
Patch: Nobuaki Sukegawa
This closes: #358
diff --git a/lib/csharp/test/ThriftTest/TestClient.cs b/lib/csharp/test/ThriftTest/TestClient.cs
index a0ceb15..ec0696a 100644
--- a/lib/csharp/test/ThriftTest/TestClient.cs
+++ b/lib/csharp/test/ThriftTest/TestClient.cs
@@ -32,7 +32,7 @@
private static int numIterations = 1;
private static string protocol = "";
- public static void Execute(string[] args)
+ public static bool Execute(string[] args)
{
try
{
@@ -41,6 +41,7 @@
string url = null, pipe = null;
int numThreads = 1;
bool buffered = false, framed = false, encrypted = false;
+ string certPath = "../../../../../keys/server.pem";
try
{
@@ -96,6 +97,10 @@
encrypted = true;
Console.WriteLine("Using encrypted transport");
}
+ else if (args[i].StartsWith("--cert="))
+ {
+ certPath = args[i].Substring("--cert=".Length);
+ }
}
}
catch (Exception e)
@@ -119,7 +124,7 @@
else
{
if (encrypted)
- trans = new TTLSSocket(host, port, "../../../../../keys/client.pem");
+ trans = new TTLSSocket(host, port, certPath);
else
trans = new TSocket(host, port);
}
@@ -151,10 +156,12 @@
catch (Exception outerEx)
{
Console.WriteLine(outerEx.Message + " ST: " + outerEx.StackTrace);
+ return false;
}
Console.WriteLine();
Console.WriteLine();
+ return true;
}
public static void ClientThread(object obj)