Merge pull request #410 from raul-arabaolaza/JENKINS-49263

[JENKINS-49263] Remove flaky and no robust enough tests from SmokeTest Category
jenkinsci · Feb 14, 2018 · bdef2c3 · bdef2c3
2 parents 8c74b90 + 9098f4a
commit bdef2c3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/test/java/core/JenkinsDatabaseSecurityRealmTest.java b/src/test/java/core/JenkinsDatabaseSecurityRealmTest.java
@@ -60,7 +60,8 @@ public void setUp() {
     }
 
     @Test
-    @Category(SmokeTest.class)
+    //TODO Re enable category once JENKINS-49524 is done
+    //@Category(SmokeTest.class)
     public void login_and_logout() {
 
         User user = realm.signup().fullname(FULL_NAME).email(EMAIL).password(PWD).signup(NAME);

diff --git a/src/test/java/core/ScriptTest.java b/src/test/java/core/ScriptTest.java
@@ -16,7 +16,6 @@ public class ScriptTest extends AbstractJUnitTest {
     SlaveController slave;
 
     @Test
-    @Category(SmokeTest.class)
     public void execute_system_script() throws Exception {
         String output = jenkins.runScript("println Jenkins.instance.displayName;");
         assertThat(output, is("Jenkins"));

diff --git a/src/test/java/core/SlaveTest.java b/src/test/java/core/SlaveTest.java
@@ -75,7 +75,6 @@ public void slave_disconnect_reconnect() throws ExecutionException, InterruptedE
     }
 
     @Test
-    @Category(SmokeTest.class)
     public void tie_job_to_specified_label() throws Exception {
         FreeStyleJob j = jenkins.jobs.create();
         slave.configure();