You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/09/25 03:51:37 UTC
[kylin] branch 2.4.x updated: KYLIN-3541 clean ci meaningless
messages
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch 2.4.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/2.4.x by this push:
new 6327606 KYLIN-3541 clean ci meaningless messages
6327606 is described below
commit 632760603916c8b0412d7abed80abf8decbfb172
Author: shaofengshi <sh...@apache.org>
AuthorDate: Mon Sep 24 20:38:35 2018 +0800
KYLIN-3541 clean ci meaningless messages
---
.../java/org/apache/kylin/rest/controller/JobController.java | 2 +-
.../org/apache/kylin/rest/controller/JobControllerTest.java | 12 ------------
.../org/apache/kylin/rest/security/KylinUserManagerTest.java | 6 +++---
.../org/apache/kylin/rest/security/TableACLManagerTest.java | 4 ++--
.../org/apache/kylin/rest/util/MultiNodeManagerTestBase.java | 6 +++---
5 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
index 1bf6ab6..d14d7a8 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
@@ -78,7 +78,7 @@ public class JobController extends BasicController {
try {
jobSearchMode = JobService.JobSearchMode.valueOf(jobRequest.getJobSearchMode());
} catch (IllegalArgumentException e) {
- logger.error("Invalid value for JobSearchMode: '" + jobRequest.getJobSearchMode() + "', skip it.", e);
+ logger.warn("Invalid value for JobSearchMode: '" + jobRequest.getJobSearchMode() + "', skip it.");
}
}
diff --git a/server/src/test/java/org/apache/kylin/rest/controller/JobControllerTest.java b/server/src/test/java/org/apache/kylin/rest/controller/JobControllerTest.java
index 4364743..f55e56b 100644
--- a/server/src/test/java/org/apache/kylin/rest/controller/JobControllerTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/controller/JobControllerTest.java
@@ -123,16 +123,4 @@ public class JobControllerTest extends ServiceTestBase {
// jobSchedulerController.cancel(job.getId());
}
- @Test(expected = RuntimeException.class)
- public void testResume() throws IOException {
- JobBuildRequest jobBuildRequest = new JobBuildRequest();
- jobBuildRequest.setBuildType("BUILD");
- jobBuildRequest.setStartTime(20130331080000L);
- jobBuildRequest.setEndTime(20131212080000L);
-
- // Yang: how to rebuild a cube does not exists?!
- JobInstance job = cubeController.rebuild(CUBE_NAME, jobBuildRequest);
-
- jobSchedulerController.resume(job.getId());
- }
}
diff --git a/server/src/test/java/org/apache/kylin/rest/security/KylinUserManagerTest.java b/server/src/test/java/org/apache/kylin/rest/security/KylinUserManagerTest.java
index 7024c4f..e83f21d 100644
--- a/server/src/test/java/org/apache/kylin/rest/security/KylinUserManagerTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/security/KylinUserManagerTest.java
@@ -36,15 +36,15 @@ public class KylinUserManagerTest extends MultiNodeManagerTestBase {
final KylinUserManager managerB = new KylinUserManager(configB);
ManagedUser u1 = new ManagedUser("u1", "skippped", false, Lists.<GrantedAuthority> newArrayList());
managerA.update(u1);
- Thread.sleep(1000);
+ Thread.sleep(3000);
ManagedUser u11 = new ManagedUser("u1", "password", false,
Lists.<GrantedAuthority> newArrayList(new SimpleGrantedAuthority(Constant.ROLE_ANALYST)));
managerB.update(u11);
- Thread.sleep(1000);
+ Thread.sleep(3000);
Assert.assertEquals("password", managerA.get("u1").getPassword());
Assert.assertEquals("password", managerB.get("u1").getPassword());
managerB.delete("u1");
- Thread.sleep(1000);
+ Thread.sleep(3000);
Assert.assertNull(managerA.get("u1"));
Assert.assertNull(managerB.get("u1"));
}
diff --git a/server/src/test/java/org/apache/kylin/rest/security/TableACLManagerTest.java b/server/src/test/java/org/apache/kylin/rest/security/TableACLManagerTest.java
index 6076a10..3309a6d 100644
--- a/server/src/test/java/org/apache/kylin/rest/security/TableACLManagerTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/security/TableACLManagerTest.java
@@ -46,12 +46,12 @@ public class TableACLManagerTest extends MultiNodeManagerTestBase {
Assert.assertEquals(0, tableACLManagerB.getTableACLByCache(PROJECT).size());
tableACLManagerA.addTableACL(PROJECT, USER, TABLE, MetadataConstants.TYPE_USER);
// if don't sleep, manager B's get method is faster than notify
- Thread.sleep(1000);
+ Thread.sleep(3000);
Assert.assertEquals(1, tableACLManagerB.getTableACLByCache(PROJECT).size());
Assert.assertEquals(1, tableACLManagerA.getTableACLByCache(PROJECT).size());
tableACLManagerB.deleteTableACL(PROJECT, USER, TABLE, MetadataConstants.TYPE_USER);
- Thread.sleep(1000);
+ Thread.sleep(3000);
Assert.assertEquals(0, tableACLManagerA.getTableACLByCache(PROJECT).size());
}
}
diff --git a/server/src/test/java/org/apache/kylin/rest/util/MultiNodeManagerTestBase.java b/server/src/test/java/org/apache/kylin/rest/util/MultiNodeManagerTestBase.java
index 9610f2f..bbee7bd 100644
--- a/server/src/test/java/org/apache/kylin/rest/util/MultiNodeManagerTestBase.java
+++ b/server/src/test/java/org/apache/kylin/rest/util/MultiNodeManagerTestBase.java
@@ -33,13 +33,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MultiNodeManagerTestBase extends LocalFileMetadataTestCase {
- private static Server server;
+ private Server server;
protected static String PROJECT = "default";
protected static String USER = "u1";
protected static String TABLE = "t1";
- protected static KylinConfig configA;
- protected static KylinConfig configB;
+ protected KylinConfig configA;
+ protected KylinConfig configB;
private static final Logger logger = LoggerFactory.getLogger(MultiNodeManagerTestBase.class);
@Before