2010-01-20 Atsushi Enomoto <atsushi@ximian.com>

	* NetTcpBindingTest.cs : disable connection tests, with analyzed
	  reason why it's blocking, for each.

	* System.ServiceModel_test.dll.sources: move back some FeatureBased
	  tests.

svn path=/trunk/mcs/; revision=149878

diff --git a/mcs/class/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/ChangeLog
index 755775cca39f0f503b173085b2a502d790de43b0..e3ca6f00bc2e1d526f028488899c7ca538a15e11 100755 (executable)
--- a/mcs/class/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-20  Astushi Enomoto  <atsushi@ximian.com>
+
+       * System.ServiceModel_test.dll.sources: move back some FeatureBased
+         tests.
+
 2010-01-18  Astushi Enomoto  <atsushi@ximian.com>
 
        * System.ServiceModel.dll.sources : added new security version types.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel_test.dll.sources b/mcs/class/System.ServiceModel/System.ServiceModel_test.dll.sources
index 635026ec5f3e7530d4ee7d128ba0bc9ac2799087..aaeadc7b8ff67b5524e5085890beb6da0ad24d90 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel_test.dll.sources
+++ b/mcs/class/System.ServiceModel/System.ServiceModel_test.dll.sources
@@ -161,7 +161,9 @@ FeatureBased/Features.Client/FaultsTesterProxy.cs
 FeatureBased/Features.Client/KnownTypeTesterProxy.cs
 FeatureBased/Features.Client/MessageContractTesterProxy.cs
 FeatureBased/Features.Client/UntypedMessageTesterProxy.cs
+FeatureBased/Features.Serialization/FaultsTest.cs
 FeatureBased/Features.Contracts/FaultsTester.cs
 FeatureBased/Features.Contracts/KnownTypeTester.cs
+FeatureBased/Features.Serialization/MessageContractTest.cs
 FeatureBased/Features.Contracts/UntypedMessageTester.cs
 FeatureBased/Features.Serialization/XmlComparer.cs

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
index 048dc75e6b8098a95bb28a495ca9162beb5a161d..0ef8d887f4706dcd39105dede76c9ee92a612f3b 100755 (executable)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-20  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * NetTcpBindingTest.cs : disable connection tests, with analyzed
+         reason why it's blocking, for each.
+
 2010-01-13  Atsushi Enomoto  <atsushi@ximian.com>
 
        * EndpointAddressBuilderTest.cs : add usage example test.

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs
index 693c1b26ccf5699d3dc7e074aea7e0c9ef0f89ad..072603784dce14938241f8c888d7f75eccec1274 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs
@@ -69,6 +69,13 @@ namespace MonoTests.System.ServiceModel
                // are bad enough to be disabled.
 
                [Test]
+               [Category ("NotWorking")] // this is disabled because right now
+               // there is no way for ChannelDispatcher to "close" the accepted
+               // channels, which is typically done at the end of request
+               // processing. ChannelDispatcher proceeds channel acceptor
+               // throttling cycle only when a channel is closed. But since
+               // it does not happen on TCP duplex session channels, it will
+               // end up to infinite wait by throttling WaitHandle.
                public void BufferedConnection ()
                {
                        var host = new ServiceHost (typeof (Foo));
@@ -93,6 +100,11 @@ namespace MonoTests.System.ServiceModel
                }
 
                [Test]
+               [Category ("NotWorking")] // similar to BufferedConnection(), 
+               // but the reason should be different as it is not duplex.
+               // I haven't investigated the reason why it fails only as NUnit 
+               // test (and blocked only when FaultsTest.cs is included in the
+               // test assembly).
                public void StreamedConnection ()
                {
                        var host = new ServiceHost (typeof (Foo));