From 4f1e282b48659c01314b8cc0d77abf48f70de5c4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Sat, 4 Jan 2020 17:30:34 -0500 Subject: [PATCH 1/2] Trying to diagnose some flaky tests. --- .../io/jenkins/plugins/casc/ConfigurationAsCodeTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java index 4969ead3f5..dc8813a811 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java @@ -29,6 +29,7 @@ import static io.jenkins.plugins.casc.ConfigurationAsCode.CASC_JENKINS_CONFIG_PROPERTY; import static io.jenkins.plugins.casc.misc.Util.getJenkinsRoot; import static io.jenkins.plugins.casc.misc.Util.toYamlString; +import java.util.Arrays; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; @@ -86,7 +87,7 @@ public void init_test_from_accepted_sources() throws Exception { assertThat(casc.configs(exactFile.getAbsolutePath()), hasSize(1)); final List foo = casc.configs(tempFolder.getRoot().getAbsolutePath()); - assertThat(foo, hasSize(6)); + assertThat("failed to find 6 configs in " + Arrays.toString(tempFolder.getRoot().list()), foo, hasSize(6)); } @Test @@ -99,7 +100,7 @@ public void test_ordered_config_loading() throws Exception { tempFolder.newFile("z.yaml"); final List foo = casc.configs(tempFolder.getRoot().getAbsolutePath()); - assertThat(foo, hasSize(4)); + assertThat("failed to find 4 configs in " + Arrays.toString(tempFolder.getRoot().list()), foo, hasSize(4)); assertTrue(foo.get(0).endsWith("0.yaml")); assertTrue(foo.get(1).endsWith("1.yaml")); assertTrue(foo.get(2).endsWith("a.yaml")); From 4d49e0e712ce61d9d924ddb067b89ce36cda9df8 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Sat, 4 Jan 2020 17:37:59 -0500 Subject: [PATCH 2/2] CheckStyle --- .../java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java index dc8813a811..b7e9070345 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java @@ -17,6 +17,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import java.util.Arrays; import java.util.List; import org.junit.Assume; import org.junit.Rule; @@ -29,7 +30,6 @@ import static io.jenkins.plugins.casc.ConfigurationAsCode.CASC_JENKINS_CONFIG_PROPERTY; import static io.jenkins.plugins.casc.misc.Util.getJenkinsRoot; import static io.jenkins.plugins.casc.misc.Util.toYamlString; -import java.util.Arrays; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo;