Skip to content

Commit 7382125

Browse files
vasacvasac
committed
COH-30975 .NET main Linux and macOS builds are failing on GitHub
[git-p4: depot-paths = "//dev/main.net/": change = 111679]
1 parent 5052115 commit 7382125

File tree

9 files changed

+337
-156
lines changed

9 files changed

+337
-156
lines changed

‎tests/Coherence.Pof.Tests/Coherence.Pof.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="nunit" Version="3.12.0" />
15+
<PackageReference Include="nunit" Version="3.14.0" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1717
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
1818
<PackageReference Include="TestCentric.Metadata" Version="2.0.0" />

‎tests/Coherence.Tests/Coherence.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.31" />
18-
<PackageReference Include="nunit" Version="3.12.0" />
18+
<PackageReference Include="nunit" Version="3.14.0" />
1919
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
2121
<PackageReference Include="System.Text.Json" Version="6.0.9" />
@@ -40,7 +40,7 @@
4040
<Copy SourceFiles="appsettings.json" DestinationFiles="$(OutDir)\ReSharperTestRunner64.dll.config" />
4141
</Target>
4242

43-
<Target Name="InstallCerts" AfterTargets="AfterBuild">
43+
<Target Name="InstallCerts" AfterTargets="AfterBuild" Condition="$(RuntimeIdentifier.StartsWith('win'))">
4444
<Exec ContinueOnError="true" Command="certutil -delstore -v My MyClient"/>
4545
<Exec ContinueOnError="true" Command="certutil -delstore -v My MyServerName"/>
4646
<Exec ContinueOnError="true" Command="certutil -delstore -v My &quot;Test And Dev Root Authority&quot;"/>

‎tests/Coherence.Tests/Net/Impl/SSLOneWayRemoteNamedCacheTests.cs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
using System;
8-
using System.IO;
98

109
using NUnit.Framework;
11-
using Tangosol.Net.Cache;
12-
using Tangosol.Net.Messaging.Impl.NamedCache;
13-
using Tangosol.Util;
10+
using Tangosol.Run.Xml;
1411

1512
namespace Tangosol.Net.Impl
1613
{
1714
[TestFixture]
15+
[Platform(Exclude="Unix,Linux,MacOsX")]
1816
public class SSLOneWayRemoteNamedCacheTests : RemoteNamedCacheTests
1917
{
2018
protected override String TestCacheName
2119
{
2220
get { return "sslOneWayCacheName"; }
2321
}
2422

23+
[SetUp]
24+
public void SetUp()
25+
{
26+
var ccf = CacheFactory.ConfigurableCacheFactory;
27+
var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
28+
ccf.Config = config;
29+
}
30+
31+
[TearDown]
32+
public void TearDown()
33+
{
34+
CacheFactory.Shutdown();
35+
}
36+
2537
[Test]
2638
public virtual void TestNamedCache()
2739
{

‎tests/Coherence.Tests/Net/Impl/SSLRemoteNamedCacheTests.cs

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
using System;
88
using System.IO;
9-
using System.Collections;
109
using System.Collections.Specialized;
11-
using System.Threading;
1210

1311
using NUnit.Framework;
14-
using Tangosol.Net.Cache;
15-
using Tangosol.Net.Messaging.Impl.NamedCache;
16-
using Tangosol.Util;
12+
using Tangosol.Run.Xml;
1713

1814
namespace Tangosol.Net.Impl {
1915

2016
[TestFixture]
17+
[Platform(Exclude="Unix,Linux,MacOsX")]
2118
public class SSLRemoteNamedCacheTests
2219
{
2320

@@ -35,6 +32,20 @@ protected String TwoWayCacheName
3532
set { m_cacheName = value; }
3633
}
3734

35+
[SetUp]
36+
public void SetUp()
37+
{
38+
var ccf = CacheFactory.ConfigurableCacheFactory;
39+
var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
40+
ccf.Config = config;
41+
}
42+
43+
[TearDown]
44+
public void TearDown()
45+
{
46+
CacheFactory.Shutdown();
47+
}
48+
3849
[Test]
3950
public virtual void TestOneWayNamedCache()
4051
{

‎tests/Coherence.Tests/Net/Impl/SSLTwoWayRemoteNamedCacheTests.cs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
using System;
8-
using System.IO;
98

109
using NUnit.Framework;
11-
using Tangosol.Net.Cache;
12-
using Tangosol.Net.Messaging.Impl.NamedCache;
13-
using Tangosol.Util;
10+
using Tangosol.Run.Xml;
1411

1512
namespace Tangosol.Net.Impl
1613
{
1714
[TestFixture]
15+
[Platform(Exclude="Unix,Linux,MacOsX")]
1816
public class SSLTwoWayRemoteNamedCacheTests : RemoteNamedCacheTests
1917
{
2018
protected override String TestCacheName
2119
{
2220
get { return "sslTwoWayCacheName"; }
2321
}
2422

23+
[SetUp]
24+
public void SetUp()
25+
{
26+
var ccf = CacheFactory.ConfigurableCacheFactory;
27+
var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
28+
ccf.Config = config;
29+
}
30+
31+
[TearDown]
32+
public void TearDown()
33+
{
34+
CacheFactory.Shutdown();
35+
}
36+
2537
[Test]
2638
public virtual void TestNamedCache()
2739
{

‎tests/Coherence.Tests/Net/Impl/TLS12OneWayRemoteNamedCacheTests.cs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
using System;
8-
using System.IO;
98

109
using NUnit.Framework;
11-
using Tangosol.Net.Cache;
12-
using Tangosol.Net.Messaging.Impl.NamedCache;
13-
using Tangosol.Util;
10+
using Tangosol.Run.Xml;
1411

1512
namespace Tangosol.Net.Impl
1613
{
1714
[TestFixture]
15+
[Platform(Exclude="Unix,Linux,MacOsX")]
1816
public class TLS12OneWayRemoteNamedCacheTests : RemoteNamedCacheTests
1917
{
2018
protected override String TestCacheName
2119
{
2220
get { return "tls12CacheName"; }
2321
}
2422

23+
[SetUp]
24+
public void SetUp()
25+
{
26+
var ccf = CacheFactory.ConfigurableCacheFactory;
27+
var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
28+
ccf.Config = config;
29+
}
30+
31+
[TearDown]
32+
public void TearDown()
33+
{
34+
CacheFactory.Shutdown();
35+
}
36+
2537
[Test]
2638
public virtual void TestNamedCache()
2739
{

0 commit comments

Comments
 (0)