Merge pull request #45242 from spiffxp/skip-metrics-procfs-test

Automatic merge from submit-queue (batch tested with PRs 45125, 45242) skip procfs-dependent metrics test if not on linux **What this PR does / why we need it**: #40774 removed build tags on integration tests, which uncovered the fact that a test in `test/integration/metrics` relies on `procfs`. This PR follows the convention used in `pkg/util/procfs` to gate the test on `runtime.GOOS` **Release note**: ```release-note NONE ``` /cc @kubernetes/sig-testing-pr-reviews

Merge pull request #45242 from spiffxp/skip-metrics-procfs-test
cf6c279f · Kubernetes Submit Queue · GitHub · 52a18e97 · 276704ee · cf6c279f
Commit cf6c279f authored May 02, 2017 by Kubernetes Submit Queue Committed by GitHub May 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

metrics_test.go test/integration/metrics/metrics_test.go +5 -1

No files found.
--- a/test/integration/metrics/metrics_test.go
+++ b/test/integration/metrics/metrics_test.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
+	"runtime"
 	"testing"

 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -85,6 +86,10 @@ func checkForExpectedMetrics(t *testing.T, metrics []*prometheuspb.MetricFamily,
 }

 func TestMasterProcessMetrics(t *testing.T) {
+	if runtime.GOOS == "darwin" || runtime.GOOS == "windows" {
+		t.Skipf("not supported on GOOS=%s", runtime.GOOS)
+	}
+
 	_, s := framework.RunAMaster(nil)
 	defer s.Close()

@@ -95,7 +100,6 @@ func TestMasterProcessMetrics(t *testing.T) {
 	checkForExpectedMetrics(t, metrics, []string{
 		"process_start_time_seconds",
 		"process_cpu_seconds_total",
-		"go_goroutines",
 		"process_open_fds",
 		"process_resident_memory_bytes",
 	})