Skip to content

Un-skip flaky tests #12388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ycombinator merged 3 commits into from
Jun 4, 2019
Merged

Un-skip flaky tests #12388

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f64ef82
Un-skip flaky tests
ycombinator Jun 1, 2019
f3f35e0
Use updated test methods
ycombinator Jun 1, 2019
60a2b41
Increasing timeout
ycombinator Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions metricbeat/module/elasticsearch/elasticsearch_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ var metricSets = []string{
}

func TestFetch(t *testing.T) {
t.Skip("flaky")
compose.EnsureUp(t, "elasticsearch")

host := net.JoinHostPort(getEnvHost(), getEnvPort())
Expand All @@ -87,8 +86,8 @@ func TestFetch(t *testing.T) {
for _, metricSet := range metricSets {
checkSkip(t, metricSet, version)
t.Run(metricSet, func(t *testing.T) {
f := mbtest.NewReportingMetricSetV2(t, getConfig(metricSet))
events, errs := mbtest.ReportingFetchV2(f)
f := mbtest.NewReportingMetricSetV2Error(t, getConfig(metricSet))
events, errs := mbtest.ReportingFetchV2Error(f)

assert.Empty(t, errs)
if !assert.NotEmpty(t, events) {
Expand All @@ -101,7 +100,6 @@ func TestFetch(t *testing.T) {
}

func TestData(t *testing.T) {
t.Skip("flaky")
compose.EnsureUp(t, "elasticsearch")

host := net.JoinHostPort(getEnvHost(), getEnvPort())
Expand All @@ -114,8 +112,8 @@ func TestData(t *testing.T) {
for _, metricSet := range metricSets {
checkSkip(t, metricSet, version)
t.Run(metricSet, func(t *testing.T) {
f := mbtest.NewReportingMetricSetV2(t, getConfig(metricSet))
err := mbtest.WriteEventsReporterV2(f, t, metricSet)
f := mbtest.NewReportingMetricSetV2Error(t, getConfig(metricSet))
err := mbtest.WriteEventsReporterV2Error(f, t, metricSet)
if err != nil {
t.Fatal("write", err)
}
Expand Down Expand Up @@ -263,7 +261,7 @@ func createCCRStats(host string) error {
return checkCCRStatsExists(host)
}

exists, err := waitForSuccess(checkCCRStats, 200, 5)
exists, err := waitForSuccess(checkCCRStats, 300, 5)
if err != nil {
return errors.Wrap(err, "error checking if CCR stats exist")
}
Expand Down