Skip to content

Commit da92bd5

Browse files
committed
fix ut
1 parent 9a197d0 commit da92bd5

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

kyuubi-rest-client/src/test/java/org/apache/kyuubi/client/BatchRestClientTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,13 @@ public void getOperationLogTest() {
267267
public void deleteBatchTest() {
268268
// test spnego auth
269269
BatchTestServlet.setAuthSchema(NEGOTIATE_AUTH);
270-
CloseBatchResponse response = spnegoBatchRestApi.deleteBatch("71535", "b_test");
270+
CloseBatchResponse response = spnegoBatchRestApi.deleteBatch("71535");
271271
assertTrue(response.isSuccess());
272272

273273
// test basic auth
274274
BatchTestServlet.setAuthSchema(BASIC_AUTH);
275275
BatchTestServlet.allowAnonymous(false);
276-
response = basicBatchRestApi.deleteBatch("71535", "b_test");
276+
response = basicBatchRestApi.deleteBatch("71535");
277277
assertTrue(response.isSuccess());
278278
}
279279
}

kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/InternalRestClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class InternalRestClient(
6060

6161
def deleteBatch(user: String, batchId: String): CloseBatchResponse = {
6262
withAuthUser(user) {
63-
internalBatchRestApi.deleteBatch(batchId, null)
63+
internalBatchRestApi.deleteBatch(batchId)
6464
}
6565
}
6666

kyuubi-server/src/test/scala/org/apache/kyuubi/server/rest/client/BatchRestApiSuite.scala

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,9 @@ class BatchRestApiSuite extends RestClientTestHelper with BatchTestHelper {
7474
}
7575

7676
// delete batch
77-
val closeResp = batchRestApi.deleteBatch(batch.getId(), null)
77+
val closeResp = batchRestApi.deleteBatch(batch.getId())
7878
assert(closeResp.getMsg.nonEmpty)
7979

80-
// delete batch - error
81-
val e = intercept[KyuubiRestException] {
82-
batchRestApi.deleteBatch(batch.getId(), "fake")
83-
}
84-
assert(e.getCause.toString.contains(
85-
s"Failed to validate proxy privilege of ${ldapUser} for fake"))
86-
8780
basicKyuubiRestClient.close()
8881
}
8982

@@ -170,7 +163,7 @@ class BatchRestApiSuite extends RestClientTestHelper with BatchTestHelper {
170163
}
171164

172165
// delete batch
173-
val closeResp = batchRestApi.deleteBatch(batch.getId(), proxyUser)
166+
val closeResp = batchRestApi.deleteBatch(batch.getId())
174167
assert(closeResp.getMsg.nonEmpty)
175168

176169
// list batches

0 commit comments

Comments
 (0)