diff --git a/code/functions/search-query/test/nu/marginalia/functions/searchquery/query_parser/model/QWordGraphTest.java b/code/functions/search-query/test/nu/marginalia/functions/searchquery/query_parser/model/QWordGraphTest.java index e1df546c..5d00771d 100644 --- a/code/functions/search-query/test/nu/marginalia/functions/searchquery/query_parser/model/QWordGraphTest.java +++ b/code/functions/search-query/test/nu/marginalia/functions/searchquery/query_parser/model/QWordGraphTest.java @@ -1,9 +1,8 @@ package nu.marginalia.functions.searchquery.query_parser.model; -import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import java.util.Comparator; import java.util.Set; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -101,7 +100,7 @@ class QWordGraphTest { assertEquals("q b ( c | d )", graph.compileToQuery()); } - @Disabled // flaky, the order of the variants is not guaranteed + @Tag("flaky") // flaky, the order of the variants is not guaranteed @Test void testCompile5() { // Construct a graph like diff --git a/code/processes/converting-process/test/nu/marginalia/converting/ConvertingIntegrationTest.java b/code/processes/converting-process/test/nu/marginalia/converting/ConvertingIntegrationTest.java index a2770f36..728d57ca 100644 --- a/code/processes/converting-process/test/nu/marginalia/converting/ConvertingIntegrationTest.java +++ b/code/processes/converting-process/test/nu/marginalia/converting/ConvertingIntegrationTest.java @@ -15,6 +15,7 @@ import nu.marginalia.model.crawldata.CrawledDomain; import nu.marginalia.model.crawldata.SerializableCrawlData; import nu.marginalia.model.html.HtmlStandard; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -24,6 +25,7 @@ import java.util.*; import static org.junit.jupiter.api.Assertions.*; +@Tag("slow") public class ConvertingIntegrationTest { private DomainProcessor domainProcessor; diff --git a/code/processes/converting-process/test/nu/marginalia/converting/processor/summary/SummaryExtractorTest.java b/code/processes/converting-process/test/nu/marginalia/converting/processor/summary/SummaryExtractorTest.java index 62ec718e..cd7708a5 100644 --- a/code/processes/converting-process/test/nu/marginalia/converting/processor/summary/SummaryExtractorTest.java +++ b/code/processes/converting-process/test/nu/marginalia/converting/processor/summary/SummaryExtractorTest.java @@ -10,6 +10,7 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -17,6 +18,7 @@ import java.net.URISyntaxException; import java.nio.file.Path; import java.util.*; +@Tag("slow") class SummaryExtractorTest { private SummaryExtractor summaryExtractor; private DocumentKeywordExtractor keywordExtractor; diff --git a/code/processes/converting-process/test/nu/marginalia/converting/sideload/reddit/RedditSideloaderTest.java b/code/processes/converting-process/test/nu/marginalia/converting/sideload/reddit/RedditSideloaderTest.java index 5d7e25b4..9c40bcab 100644 --- a/code/processes/converting-process/test/nu/marginalia/converting/sideload/reddit/RedditSideloaderTest.java +++ b/code/processes/converting-process/test/nu/marginalia/converting/sideload/reddit/RedditSideloaderTest.java @@ -7,6 +7,7 @@ import nu.marginalia.converting.ConverterModule; import nu.marginalia.converting.processor.ConverterDomainTypes; import nu.marginalia.converting.sideload.SideloadSourceFactory; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -17,6 +18,7 @@ import java.util.UUID; import static org.mockito.Mockito.when; +@Tag("slow") class RedditSideloaderTest extends AbstractModule { /* This test case exists for debugging, to get deep into the Reddit sideloader and see if it can read the files. * Update the path to the Reddit database in the dbPath variable. diff --git a/code/services-application/api-service/test/nu/marginalia/api/svc/RateLimiterServiceTest.java b/code/services-application/api-service/test/nu/marginalia/api/svc/RateLimiterServiceTest.java index c5bbad3b..b801c3d1 100644 --- a/code/services-application/api-service/test/nu/marginalia/api/svc/RateLimiterServiceTest.java +++ b/code/services-application/api-service/test/nu/marginalia/api/svc/RateLimiterServiceTest.java @@ -3,10 +3,12 @@ package nu.marginalia.api.svc; import nu.marginalia.api.model.ApiLicense; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +@Tag("flaky") class RateLimiterServiceTest { RateLimiterService rateLimiterService; diff --git a/srcsets.gradle b/srcsets.gradle index 9730b830..5c90f9e7 100644 --- a/srcsets.gradle +++ b/srcsets.gradle @@ -15,6 +15,7 @@ tasks.register('fastTests', Test) { maxHeapSize = "8G" useJUnitPlatform { excludeTags "slow" + excludeTags "flaky" } }