summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorValery Piashchynski <[email protected]>2021-09-12 22:44:34 +0300
committerValery Piashchynski <[email protected]>2021-09-12 22:44:34 +0300
commitb7629ed14bb57c770e1e7f6f2da2d967b72c9789 (patch)
treee537a4843b2acf35fb4d72a149b399cca2636d93 /tests
parent52c2330cbd126533d992d4b73b3f8e2f2e27f7bf (diff)
parentfe72d84395970281fe330a2b9423f8c0e4c3b9c8 (diff)
Merge remote-tracking branch 'origin' into bug/local-and-global-sections-incorrect-parsing
Diffstat (limited to 'tests')
-rw-r--r--tests/plugins/jobs/jobs_memory_test.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/plugins/jobs/jobs_memory_test.go b/tests/plugins/jobs/jobs_memory_test.go
index 20cbfb3f..7e39c556 100644
--- a/tests/plugins/jobs/jobs_memory_test.go
+++ b/tests/plugins/jobs/jobs_memory_test.go
@@ -107,7 +107,7 @@ func TestMemoryInit(t *testing.T) {
}
}()
- time.Sleep(time.Second * 3)
+ time.Sleep(time.Second * 1)
stopCh <- struct{}{}
wg.Wait()
}
@@ -229,7 +229,7 @@ func TestMemoryPauseResume(t *testing.T) {
mockLogger.EXPECT().Error(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
mockLogger.EXPECT().Info("pipeline active", "pipeline", "test-local-2", "start", gomock.Any(), "elapsed", gomock.Any()).Times(1)
- mockLogger.EXPECT().Info("pipeline active", "pipeline", "test-local", "start", gomock.Any(), "elapsed", gomock.Any()).Times(3)
+ mockLogger.EXPECT().Info("pipeline active", "pipeline", "test-local", "start", gomock.Any(), "elapsed", gomock.Any()).Times(2)
mockLogger.EXPECT().Info("pipeline paused", "pipeline", "test-local", "driver", "memory", "start", gomock.Any(), "elapsed", gomock.Any()).Times(1)
@@ -301,7 +301,6 @@ func TestMemoryPauseResume(t *testing.T) {
time.Sleep(time.Second * 3)
- t.Run("Resume", resumePipes("test-local"))
t.Run("Pause", pausePipelines("test-local"))
t.Run("pushToDisabledPipe", pushToDisabledPipe("test-local"))
t.Run("Resume", resumePipes("test-local"))