feat(testing): Remove flag parse

#10
yyoshiki41 · Jan 18, 2018 · 8982bf4 · 8982bf4
1 parent fe6f7f9
commit 8982bf4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -20,11 +20,11 @@ test:
 	go test $(PKGS)
 
 test-out:
-	go test -outjp $(PKGS)
+	GO_RADIKO_OUTSIDE_JP=true go test $(PKGS)
 
 test-ci:
-	@echo "go test -outjp"
-	@go test -outjp -race -coverprofile=coverage.txt -covermode=atomic $(PKGS)
+	@echo "GO_RADIKO_OUTSIDE_JP=true go test"
+	@GO_RADIKO_OUTSIDE_JP=true go test -outjp -race -coverprofile=coverage.txt -covermode=atomic $(PKGS)
 
 verify: lint vet
 

diff --git a/testing.go b/testing.go
@@ -1,17 +1,14 @@
 package radiko
 
 import (
-	"flag"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
 	"testing"
 )
 
-const (
-	areaIDTokyo = "JP13"
-)
+const areaIDTokyo = "JP13"
 
 var (
 	outsideJP bool
@@ -20,10 +17,11 @@ var (
 )
 
 func init() {
-	// FIXME:
-	// affects the outside packages
-	flag.BoolVar(&outsideJP, "outjp", false, "Skip tests if outside Japan.")
-	flag.Parse()
+	// Skip tests if outside Japan.
+	OUTSIDEJP := os.Getenv("GO_RADIKO_OUTSIDE_JP")
+	if len(OUTSIDEJP) > 0 {
+		outsideJP = true
+	}
 
 	GOPATH := os.Getenv("GOPATH")
 	testdataDir = filepath.Join(GOPATH, "src", "github.com/yyoshiki41/go-radiko", "testdata")