From cbdf457419c46b141f651c54a6b82268383a2bb2 Mon Sep 17 00:00:00 2001 From: soloturn Date: Sun, 25 Oct 2020 12:58:02 +0100 Subject: [PATCH] disable broken tests, tag as flaky which sometimes fail --- README.md | 7 ++++--- pom.xml | 2 +- .../ripme/tst/ripper/rippers/CheveretoRipperTest.java | 2 ++ .../ripme/tst/ripper/rippers/ErotivRipperTest.java | 2 ++ .../ripme/tst/ripper/rippers/FolioRipperTest.java | 2 ++ .../ripme/tst/ripper/rippers/FooktubeRipperTest.java | 2 ++ .../ripme/tst/ripper/rippers/GfycatporntubeRipperTest.java | 2 ++ .../ripme/tst/ripper/rippers/ImgurRipperTest.java | 2 ++ .../ripme/tst/ripper/rippers/LusciousRipperTest.java | 3 +++ .../ripme/tst/ripper/rippers/PichunterRipperTest.java | 6 +++--- .../ripme/tst/ripper/rippers/RedgifsRipperTest.java | 2 ++ 11 files changed, 25 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5d31bc42..e5d5146c 100644 --- a/README.md +++ b/README.md @@ -88,12 +88,13 @@ This will include all dependencies in the JAR. # Running Tests -Tests can be marked as beeing slow or not. Default is to run all tests. Slow tests can be excluded to run, and slow -tests can be run on its own. After building you can run tests, quoting might be necessary depending on your shell: +Tests can be marked as beeing slow, or flaky. Default is to run all but the flaky tests. Slow tests can be excluded to +run. slow and flaky tests can be run on its own. After building you can run tests, quoting might be necessary depending +on your shell: ```bash mvn test -mvn test -Dgroups=slow +mvn test -Dgroups=flaky,slow mvn test '-Dgroups=!slow' ``` diff --git a/pom.xml b/pom.xml index 5ccd68bd..88dc0b58 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ maven-surefire-plugin 3.0.0-M5 - shaky + flaky diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java index 385464da..420fcb00 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.net.URL; import com.rarchives.ripme.ripper.rippers.CheveretoRipper; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; public class CheveretoRipperTest extends RippersTest { @@ -13,6 +14,7 @@ public class CheveretoRipperTest extends RippersTest { testRipper(ripper); } @Test + @Tag("flaky") public void testSubdirAlbum() throws IOException { CheveretoRipper ripper = new CheveretoRipper(new URL("https://kenzato.uk/booru/album/TnEc")); testRipper(ripper); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErotivRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErotivRipperTest.java index 432b7fb9..b4afdd67 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErotivRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ErotivRipperTest.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.net.URL; import com.rarchives.ripme.ripper.rippers.ErotivRipper; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class ErotivRipperTest extends RippersTest { @@ -21,6 +22,7 @@ public class ErotivRipperTest extends RippersTest { } @Test + @Disabled("test or ripper broken") public void testGetURLsFromPage() throws IOException { URL url = new URL("https://erotiv.io/e/1568314255"); ErotivRipper ripper = new ErotivRipper(url); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FolioRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FolioRipperTest.java index 3a8627bd..9384aebf 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FolioRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FolioRipperTest.java @@ -5,6 +5,7 @@ import java.net.URL; import com.rarchives.ripme.ripper.rippers.FolioRipper; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class FolioRipperTest extends RippersTest { @@ -13,6 +14,7 @@ public class FolioRipperTest extends RippersTest { * @throws IOException */ @Test + @Disabled("test or ripper broken") public void testFolioRip() throws IOException { FolioRipper ripper = new FolioRipper(new URL("https://folio.ink/DmBe6i")); testRipper(ripper); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FooktubeRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FooktubeRipperTest.java index b98cabdd..10131c19 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FooktubeRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FooktubeRipperTest.java @@ -4,10 +4,12 @@ import java.io.IOException; import java.net.URL; import com.rarchives.ripme.ripper.rippers.FooktubeRipper; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class FooktubeRipperTest extends RippersTest { @Test + @Disabled("test or ripper broken") public void testFooktubeVideo() throws IOException { FooktubeRipper ripper = new FooktubeRipper(new URL("https://fooktube.com/video/641/in-the-cinema")); //pick any video from the front page testRipper(ripper); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/GfycatporntubeRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/GfycatporntubeRipperTest.java index 18068b18..5b8c4558 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/GfycatporntubeRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/GfycatporntubeRipperTest.java @@ -5,10 +5,12 @@ import java.net.URL; import com.rarchives.ripme.ripper.rippers.GfycatporntubeRipper; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; public class GfycatporntubeRipperTest extends RippersTest { @Test + @Tag("flaky") public void testRip() throws IOException { GfycatporntubeRipper ripper = new GfycatporntubeRipper(new URL("https://gfycatporntube.com/blowjob-bunny-puts-on-a-show/")); testRipper(ripper); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgurRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgurRipperTest.java index 3772d5f2..37ef50eb 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgurRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImgurRipperTest.java @@ -5,6 +5,7 @@ import com.rarchives.ripme.ripper.rippers.ImgurRipper.ImgurAlbum; import com.rarchives.ripme.utils.RipUtils; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -57,6 +58,7 @@ public class ImgurRipperTest extends RippersTest { } @Test + @Disabled("test or ripper broken") public void testImgurSingleImage() throws IOException { List contentURLs = new ArrayList<>(); contentURLs.add(new URL("http://imgur.com/qbfcLyG")); // Single image URL diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/LusciousRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/LusciousRipperTest.java index 52c4a3c5..7c797b4b 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/LusciousRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/LusciousRipperTest.java @@ -5,10 +5,12 @@ import java.net.URL; import com.rarchives.ripme.ripper.rippers.LusciousRipper; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class LusciousRipperTest extends RippersTest { @Test + @Disabled("test or ripper broken") public void testPahealRipper() throws IOException { // a photo set LusciousRipper ripper = new LusciousRipper( @@ -24,6 +26,7 @@ public class LusciousRipperTest extends RippersTest { } @Test + @Disabled("test or ripper broken") public void testGetNextPage() throws IOException { URL multiPageAlbumUrl = new URL("https://luscious.net/albums/women-of-color_58/"); LusciousRipper multiPageRipper = new LusciousRipper(multiPageAlbumUrl); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PichunterRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PichunterRipperTest.java index 90a36bc7..9ba9110b 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PichunterRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/PichunterRipperTest.java @@ -5,12 +5,12 @@ import java.net.URL; import com.rarchives.ripme.ripper.rippers.PichunterRipper; -import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; public class PichunterRipperTest extends RippersTest { @Test - @Disabled("This test was commented out at 6/08/2018 because it was randomly failing due to issues with the site see https://github.com/RipMeApp/ripme/issues/867") + @Tag("flaky") public void testPichunterModelPageRip() throws IOException { // A non-photoset PichunterRipper ripper = new PichunterRipper(new URL("https://www.pichunter.com/models/Madison_Ivy")); @@ -18,7 +18,7 @@ public class PichunterRipperTest extends RippersTest { } @Test - @Disabled("This test was commented out at 6/08/2018 because it was randomly failing due to issues with the site see https://github.com/RipMeApp/ripme/issues/867") + @Tag("flaky") public void testPichunterGalleryRip() throws IOException { // a photo set PichunterRipper ripper = new PichunterRipper( diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/RedgifsRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/RedgifsRipperTest.java index bcca515c..9789417d 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/RedgifsRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/RedgifsRipperTest.java @@ -14,6 +14,7 @@ public class RedgifsRipperTest extends RippersTest { * @throws IOException */ @Test + @Disabled("test or ripper broken") public void testRedgifsGoodURL() throws IOException{ RedgifsRipper ripper = new RedgifsRipper(new URL("https://www.redgifs.com/watch/talkativewarpeddragon-petite")); testRipper(ripper); @@ -24,6 +25,7 @@ public class RedgifsRipperTest extends RippersTest { * @throws IOException */ @Test + @Tag("flaky") public void testRedgifsBadRL() throws IOException{ RedgifsRipper ripper = new RedgifsRipper(new URL("https://www.gifdeliverynetwork.com/foolishelasticchimpanzee")); testRipper(ripper);