Skip to content

Skip TestUpdaterRollbackAndPauseNoMonitor #2245

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
aluzzardi merged 1 commit into from
Jun 13, 2017
Merged

Skip TestUpdaterRollbackAndPauseNoMonitor #2245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 2 additions & 27 deletions manager/orchestrator/replicated/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package replicated

import (
"fmt"
"sync/atomic"
"testing"
"time"
Expand All @@ -21,6 +20,7 @@ func TestUpdaterRollbackAndPause(t *testing.T) {
}

func TestUpdaterRollbackAndPauseNoMonitor(t *testing.T) {
t.Skip("skipping - see #2137")
testUpdaterRollback(t, api.UpdateConfig_PAUSE, false)
}

Expand Down Expand Up @@ -185,32 +185,7 @@ func testUpdaterRollback(t *testing.T, rollbackFailureAction api.UpdateConfig_Fa
assert.Equal(t, observedTask.Status.State, api.TaskStateNew)
assert.Equal(t, observedTask.Spec.GetContainer().Image, "image2")

// FIXME(aaronl): Once intermittent failure is resolved, replace the
// following loop with:
//observedTask = testutils.WatchTaskCreate(t, watchCreate)
loop:
for {
select {
case event := <-watchCreate:
if task, ok := event.(api.EventCreateTask); ok {
observedTask = task.Task
break loop
}
if _, ok := event.(api.EventUpdateTask); ok {
assert.FailNow(t, "got EventUpdateTask when expecting EventCreateTask", fmt.Sprint(event))
}
case <-time.After(time.Second):
s.View(func(tx store.ReadTx) {
service := store.GetService(tx, "id1")
fmt.Printf("service: %+v\n", service)
tasks, _ := store.FindTasks(tx, store.All)
for i, task := range tasks {
fmt.Printf("task %d: %+v\n", i, task)
}
})
assert.FailNow(t, "no task creation")
}
}
observedTask = testutils.WatchTaskCreate(t, watchCreate)
assert.Equal(t, observedTask.Status.State, api.TaskStateNew)
assert.Equal(t, observedTask.Spec.GetContainer().Image, "image2")

Expand Down