fix: silent default test output; verbose controlled by SOURCETEST_VERBOSE env var
go test -json implicitly sets testing.Verbose()=true, so the old guard always printed manga lists through the script. Switched to an env var (SOURCETEST_VERBOSE=1) set by the script only when -v is passed.
This commit is contained in:
@@ -3,11 +3,14 @@
|
|||||||
package sourcetest
|
package sourcetest
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"goyomi/internal/source"
|
"goyomi/internal/source"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var verboseOutput = os.Getenv("SOURCETEST_VERBOSE") == "1"
|
||||||
|
|
||||||
// Run verifies source metadata and, unless -short is set, calls GetPopularManga
|
// Run verifies source metadata and, unless -short is set, calls GetPopularManga
|
||||||
// and GetLatestUpdates (when supported) against the live site.
|
// and GetLatestUpdates (when supported) against the live site.
|
||||||
func Run(t *testing.T, s source.CatalogueSource, wantName, wantLang string) {
|
func Run(t *testing.T, s source.CatalogueSource, wantName, wantLang string) {
|
||||||
@@ -39,7 +42,7 @@ func Run(t *testing.T, s source.CatalogueSource, wantName, wantLang string) {
|
|||||||
if len(page.Mangas) == 0 {
|
if len(page.Mangas) == 0 {
|
||||||
t.Fatal("GetPopularManga returned 0 results")
|
t.Fatal("GetPopularManga returned 0 results")
|
||||||
}
|
}
|
||||||
if testing.Verbose() {
|
if verboseOutput {
|
||||||
t.Logf("--- GetPopularManga (%d results) ---", len(page.Mangas))
|
t.Logf("--- GetPopularManga (%d results) ---", len(page.Mangas))
|
||||||
for i, m := range page.Mangas {
|
for i, m := range page.Mangas {
|
||||||
t.Logf(" [%d] %-60s %s", i, m.Title, m.URL)
|
t.Logf(" [%d] %-60s %s", i, m.Title, m.URL)
|
||||||
@@ -67,7 +70,7 @@ func Run(t *testing.T, s source.CatalogueSource, wantName, wantLang string) {
|
|||||||
if len(page.Mangas) == 0 {
|
if len(page.Mangas) == 0 {
|
||||||
t.Fatal("GetLatestUpdates returned 0 results")
|
t.Fatal("GetLatestUpdates returned 0 results")
|
||||||
}
|
}
|
||||||
if testing.Verbose() {
|
if verboseOutput {
|
||||||
t.Logf("--- GetLatestUpdates (%d results) ---", len(page.Mangas))
|
t.Logf("--- GetLatestUpdates (%d results) ---", len(page.Mangas))
|
||||||
for i, m := range page.Mangas {
|
for i, m := range page.Mangas {
|
||||||
t.Logf(" [%d] %-60s %s", i, m.Title, m.URL)
|
t.Logf(" [%d] %-60s %s", i, m.Title, m.URL)
|
||||||
|
|||||||
@@ -232,11 +232,12 @@ ok "Network $NETWORK exists"
|
|||||||
|
|
||||||
SHORT_FLAG=""
|
SHORT_FLAG=""
|
||||||
VERBOSE_FLAG=""
|
VERBOSE_FLAG=""
|
||||||
|
VERBOSE_ENV=""
|
||||||
FLAGS=""
|
FLAGS=""
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-short) SHORT_FLAG="-short"; FLAGS="$FLAGS -short"; shift ;;
|
-short) SHORT_FLAG="-short"; FLAGS="$FLAGS -short"; shift ;;
|
||||||
-v) VERBOSE_FLAG="-v"; FLAGS="$FLAGS -v"; shift ;;
|
-v) VERBOSE_FLAG="-v"; FLAGS="$FLAGS -v"; VERBOSE_ENV="-e SOURCETEST_VERBOSE=1"; shift ;;
|
||||||
*) break ;;
|
*) break ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
@@ -262,6 +263,7 @@ set +e
|
|||||||
docker run --rm \
|
docker run --rm \
|
||||||
--network "$NETWORK" \
|
--network "$NETWORK" \
|
||||||
-e FLARESOLVERR_URL=http://flaresolverr:8191 \
|
-e FLARESOLVERR_URL=http://flaresolverr:8191 \
|
||||||
|
$VERBOSE_ENV \
|
||||||
-v "$REPO_ROOT":/workspace \
|
-v "$REPO_ROOT":/workspace \
|
||||||
-v goyomi_go_mod_cache:/go/pkg/mod \
|
-v goyomi_go_mod_cache:/go/pkg/mod \
|
||||||
-v goyomi_go_build_cache:/root/.cache/go-build \
|
-v goyomi_go_build_cache:/root/.cache/go-build \
|
||||||
|
|||||||
Reference in New Issue
Block a user