percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-19 00:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pt-3.0.5-pre-release' of percona.github.com:percona/percona-toolkit into pt-3.0.5-pre-release

Browse Source
This commit is contained in:
Carlos Salguero
2017-11-14 11:45:18 -03:00
parent 09599800b5 f655e3f014
commit d2fcd4c0cc
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/go/mongolib/stats/stats_test.go
View File

@@ -214,7 +214,7 @@ func TestStatsSingle(t *testing.T) {
t.Fatalf("cannot load expected data %s: %s", dirExpect+f, err) t.Fatalf("cannot load expected data %s: %s", dirExpect+f, err)
} }
if !reflect.DeepEqual(got, expect) { if !reflect.DeepEqual(got, expect) {
t.Errorf("s.Queries() = %v, want %v", got, expect) t.Errorf("s.Queries() = %#v, want %#v", got, expect)
} }
}) })
} }
@@ -261,7 +261,7 @@ func TestStatsAll(t *testing.T) {
t.Fatalf("cannot load expected data %s: %s", f, err) t.Fatalf("cannot load expected data %s: %s", f, err)
} }
if !reflect.DeepEqual(got, expect) { if !reflect.DeepEqual(got, expect) {
t.Errorf("s.Queries() = %v, want %v", got, expect) t.Errorf("s.Queries() = %#v, want %#v", got, expect)
} }
} }
@@ -343,7 +343,7 @@ func TestAvailableMetrics(t *testing.T) {
} }
if !reflect.DeepEqual(got, expect) { if !reflect.DeepEqual(got, expect) {
t.Errorf("s.Queries() = %v, want %v", got, expect) t.Errorf("s.Queries() = %#v, want %#v", got, expect)
} }
}) })

9
src/go/pt-mongodb-query-digest/main_test.go
View File

@@ -18,7 +18,6 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/kr/pretty"
"github.com/pborman/getopt/v2" "github.com/pborman/getopt/v2"
"github.com/percona/percona-toolkit/src/go/lib/profiling" "github.com/percona/percona-toolkit/src/go/lib/profiling"
"github.com/percona/percona-toolkit/src/go/lib/tutil" "github.com/percona/percona-toolkit/src/go/lib/tutil"
@@ -404,10 +403,6 @@ func testAllOperationsTemplate(t *testing.T, data Data) {
expected := `Profiler is disabled for the "test" database but there are \s*[0-9]+ documents in the system.profile collection. expected := `Profiler is disabled for the "test" database but there are \s*[0-9]+ documents in the system.profile collection.
Using those documents for the stats Using those documents for the stats
pt-mongodb-query-digest .+
Host: ` + data.url + `
Skipping profiled queries on these collections: \[system\.profile\]
# Totals # Totals
# Ratio [0-9\.]+ \(docs scanned/returned\) # Ratio [0-9\.]+ \(docs scanned/returned\)
@@ -450,9 +445,7 @@ Skipping profiled queries on these collections: \[system\.profile\]
expected += buf.String() expected += buf.String()
} }
fmt.Println("====================================================================================================") expected += "\n" // Looks like we expect additional line
pretty.Println(string(output))
fmt.Println("====================================================================================================")
assertRegexpLines(t, expected, string(output)) assertRegexpLines(t, expected, string(output))
} }