Skip to content

IGNITE-28446 Fix the tests after updating Java on the TeamCity agents #12976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wernerdv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

IGNITE-28446 Fix the tests after updating Java on the TeamCity agents #12976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/clients/src/test/java/org/apache/ignite/common/NodeSslConnectionMetricTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class NodeSslConnectionMetricTest extends GridCommonAbstractTest {
private static final String CIPHER_SUITE = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256";

/** Cipher suite not supported by cluster nodes. */
private static final String UNSUPPORTED_CIPHER_SUITE = "TLS_RSA_WITH_AES_128_GCM_SHA256";
private static final String UNSUPPORTED_CIPHER_SUITE = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256";

/** Local server address. */
private static final String LOCAL_CLIENT_ADDRESS = "127.0.0.1:10800";
Expand Down
6 changes: 3 additions & 3 deletions modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public void testDefaultCipherSuite() throws Exception {
@Test
public void testSameCipherSuite() throws Exception {
String ciphers = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," +
"TLS_RSA_WITH_AES_128_GCM_SHA256," +
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256," +
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256";

activate(ciphers, ciphers, EXIT_CODE_OK);
Expand All @@ -165,7 +165,7 @@ public void testSameCipherSuite() throws Exception {
*/
@Test
public void testOneCommonCipherSuite() throws Exception {
String nodeCipherSuites = "TLS_RSA_WITH_AES_128_GCM_SHA256," +
String nodeCipherSuites = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256," +
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256";

String utilityCipherSuites = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," +
Expand All @@ -179,7 +179,7 @@ public void testOneCommonCipherSuite() throws Exception {
*/
@Test
public void testNoCommonCipherSuite() throws Exception {
String nodeCipherSuites = "TLS_RSA_WITH_AES_128_GCM_SHA256";
String nodeCipherSuites = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256";

String utilityCipherSuites = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," +
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256";
Expand Down
10 changes: 5 additions & 5 deletions modules/core/src/test/java/org/apache/ignite/client/SslParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ protected ClientConfiguration getClientConfiguration() {
public void testSameCipherSuite() throws Exception {
cipherSuites = new String[] {
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
};

Expand All @@ -110,7 +110,7 @@ public void testSameCipherSuite() throws Exception {
checkSuccessfulClientStart(
new String[] {
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
},
null
Expand All @@ -123,7 +123,7 @@ public void testSameCipherSuite() throws Exception {
@Test
public void testOneCommonCipherSuite() throws Exception {
cipherSuites = new String[] {
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
};

Expand All @@ -144,7 +144,7 @@ public void testOneCommonCipherSuite() throws Exception {
@Test
public void testNoCommonCipherSuite() throws Exception {
cipherSuites = new String[] {
"TLS_RSA_WITH_AES_128_GCM_SHA256"
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
};

startGrid();
Expand All @@ -164,7 +164,7 @@ public void testNoCommonCipherSuite() throws Exception {
@Test
public void testNonExistentCipherSuite() throws Exception {
cipherSuites = new String[] {
"TLS_RSA_WITH_AES_128_GCM_SHA256"
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
};

startGrid();
Expand Down
10 changes: 5 additions & 5 deletions ...core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ public void testSameCipherSuite() throws Exception {
new String[][] {
new String[] {
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
},
new String[] {
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
}
},
Expand All @@ -87,7 +87,7 @@ public void testOneCommonCipherSuite() throws Exception {
checkDiscoverySuccess(
new String[][] {
new String[] {
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
},
new String[] {
Expand All @@ -107,7 +107,7 @@ public void testNoCommonCipherSuite() throws Exception {
checkDiscoveryFailure(
new String[][] {
new String[] {
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
},
new String[] {
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
Expand All @@ -126,7 +126,7 @@ public void testNonExistentCipherSuite() throws Exception {
checkDiscoveryFailure(
new String[][] {
new String[] {
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
"TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
},
new String[] {
Expand Down
Loading