Rearrange fixtures to match "real" proc and sys.

And add some missing fixtures for default collectors, even if they're
not read by tests yet.
This commit is contained in:
Matthias Rampke 2015-09-26 19:55:35 +02:00 committed by Matthias Rampke
commit 788ac9a859
35 changed files with 72 additions and 13 deletions

View file

@ -120,7 +120,7 @@ var (
)
func TestIPVSCollector(t *testing.T) {
if err := flag.Set("collector.procfs", "fixtures"); err != nil {
if err := flag.Set("collector.procfs", "fixtures/proc"); err != nil {
t.Fatal(err)
}
collector, err := newIPVSCollector()
@ -182,7 +182,7 @@ func (c miniCollector) Describe(ch chan<- *prometheus.Desc) {
}
func TestIPVSCollectorResponse(t *testing.T) {
if err := flag.Set("collector.procfs", "fixtures"); err != nil {
if err := flag.Set("collector.procfs", "fixtures/proc"); err != nil {
t.Fatal(err)
}
collector, err := NewIPVSCollector()
@ -194,7 +194,7 @@ func TestIPVSCollectorResponse(t *testing.T) {
rw := httptest.NewRecorder()
prometheus.Handler().ServeHTTP(rw, &http.Request{})
metricsFile := "fixtures/net/ip_vs_result.txt"
metricsFile := "fixtures/ip_vs_result.txt"
wantMetrics, err := ioutil.ReadFile(metricsFile)
if err != nil {
t.Fatalf("unable to read input test file %s: %s", metricsFile, err)