Skip to content

Commit e2ad890

Browse files
committed
[misc] test: correcting test to satisfy ES password policy
1 parent 7919bb6 commit e2ad890

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/main/java/org/mariadb/jdbc/internal/io/output/AbstractPacketOutputStream.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -731,9 +731,9 @@ public void writeBytesEscaped(byte[] bytes, int len, boolean noBackslashEscapes)
731731

732732
} else {
733733
// if buffer can't grows and space is full, need flush at first
734-
if(buf.length <= pos) {
735-
flushBuffer(false);
736-
}
734+
if (buf.length <= pos) {
735+
flushBuffer(false);
736+
}
737737
// not enough space in buffer, will fill buffer
738738
if (noBackslashEscapes) {
739739
for (int i = 0; i < len; i++) {

src/test/java/org/mariadb/jdbc/StoredProcedureTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1661,10 +1661,12 @@ public void testTimestampParameterOutput() throws Exception {
16611661

16621662
@Test(timeout = 5000)
16631663
public void testNoKillRights() throws Exception {
1664+
Assume.assumeTrue(
1665+
!"skysql".equals(System.getenv("srv")) && !"skysql-ha".equals(System.getenv("srv")));
16641666
Assume.assumeTrue(isMariadbServer() && minVersion(10, 1, 2));
16651667
Statement stmt = sharedConnection.createStatement();
16661668
stmt.execute("DROP USER IF EXISTS basicUser");
1667-
stmt.execute("CREATE USER basicUser");
1669+
stmt.execute("CREATE USER basicUser IDENTIFIED BY '!Passw0rd3Works'");
16681670
stmt.execute("GRANT ALL ON *.* TO basicUser");
16691671
stmt.execute("DROP PROCEDURE IF EXISTS p_r_d");
16701672
stmt.execute(

0 commit comments

Comments
 (0)