summaryrefslogtreecommitdiff
path: root/csharp/test/IceSSL/configuration/AllTests.cs
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/test/IceSSL/configuration/AllTests.cs')
-rw-r--r--csharp/test/IceSSL/configuration/AllTests.cs48
1 files changed, 0 insertions, 48 deletions
diff --git a/csharp/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs
index e15a28cef69..ab15c4b5af7 100644
--- a/csharp/test/IceSSL/configuration/AllTests.cs
+++ b/csharp/test/IceSSL/configuration/AllTests.cs
@@ -44,12 +44,6 @@ public class AllTests
}
result.properties.setProperty("Ice.RetryIntervals", "-1");
//result.properties.setProperty("IceSSL.Trace.Security", "1");
-
- // TODO: WORKAROUND: .NET connection closure is sometime not detected in a timely fashion
- // and ACM closes the connection first. We increase the default timeout here to prevent
- // the test from failing when this occurs. It usually takes 2 minutes for the connection
- // closure to be detected when this occurs so we set a default timeout of 3 minutes.
- result.properties.setProperty("Ice.Default.Timeout", "180000");
return result;
}
@@ -361,13 +355,6 @@ public class AllTests
{
// Expected.
}
- catch(Ice.ConnectionTimeoutException)
- {
- // TODO: WORKAROUND: .NET connection closure is sometime not detected in a timely fashion
- // and ACM closes the connection first (when this occurs, it usually takes 2 minutes for
- // the connection closure to be detected).
- Console.WriteLine("warning: connection timed out");
- }
catch(Ice.LocalException ex)
{
Console.WriteLine(ex.ToString());
@@ -488,13 +475,6 @@ public class AllTests
{
// Expected.
}
- catch(Ice.ConnectionTimeoutException)
- {
- // TODO: WORKAROUND: .NET connection closure is sometime not detected in a timely fashion
- // and ACM closes the connection first (when this occurs, it usually takes 2 minutes for
- // the connection closure to be detected).
- Console.WriteLine("warning: connection timed out");
- }
catch(Ice.LocalException ex)
{
Console.WriteLine(ex.ToString());
@@ -1088,13 +1068,6 @@ public class AllTests
{
// Expected
}
- catch(Ice.ConnectionTimeoutException)
- {
- // TODO: WORKAROUND: .NET connection closure is sometime not detected in a timely fashion
- // and ACM closes the connection first (when this occurs, it usually takes 2 minutes for
- // the connection closure to be detected).
- Console.WriteLine("warning: connection timed out");
- }
catch(Ice.LocalException ex)
{
Console.WriteLine(ex.ToString());
@@ -1230,13 +1203,6 @@ public class AllTests
{
// Expected.
}
- catch(Ice.ConnectionTimeoutException)
- {
- // TODO: WORKAROUND: .NET connection closure is sometime not detected in a timely fashion
- // and ACM closes the connection first (when this occurs, it usually takes 2 minutes for
- // the connection closure to be detected).
- Console.WriteLine("warning: connection timed out");
- }
catch(Ice.LocalException ex)
{
Console.WriteLine(ex.ToString());
@@ -1312,13 +1278,6 @@ public class AllTests
{
// Expected.
}
- catch(Ice.ConnectionTimeoutException)
- {
- // TODO: WORKAROUND: .NET connection closure is sometime not detected in a timely fashion
- // and ACM closes the connection first (when this occurs, it usually takes 2 minutes for
- // the connection closure to be detected).
- Console.WriteLine("warning: connection timed out");
- }
catch(Ice.LocalException ex)
{
Console.WriteLine(ex.ToString());
@@ -1401,13 +1360,6 @@ public class AllTests
{
// Expected.
}
- catch(Ice.ConnectionTimeoutException)
- {
- // TODO: WORKAROUND: .NET connection closure is sometime not detected in a timely fashion
- // and ACM closes the connection first (when this occurs, it usually takes 2 minutes for
- // the connection closure to be detected).
- Console.WriteLine("warning: connection timed out");
- }
catch(Ice.LocalException ex)
{
Console.Out.Write(ex.ToString());