File 0003-cmd-snap-use-less-aggressive-client-timeou... of Package snapd

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-cmd-snap-use-less-aggressive-client-timeouts-in-unit.patch of Package snapd (Revision ab5ceb80209f6b196052693751637414)

Currently displaying revision ab5ceb80209f6b196052693751637414 , Show latest

From c80725c17c1fe8f3680b27348fa48faeac4ee6ec Mon Sep 17 00:00:00 2001
Message-Id: <c80725c17c1fe8f3680b27348fa48faeac4ee6ec.1616404144.git.maciej.zenon.borzecki@canonical.com>
From: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Date: Mon, 22 Mar 2021 10:04:49 +0100
Subject: [PATCH] cmd/snap: use less aggressive client timeouts in unit tests

The client timeouts in unit tests are too aggressive. Specifically when running
on OBS, I often see a bunch of failures due to client timeouts being exceeded.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
---
 cmd/snap/cmd_services_test.go | 2 +-
 cmd/snap/cmd_snap_op_test.go  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/snap/cmd_services_test.go b/cmd/snap/cmd_services_test.go
index 40077772d48033a20414c0eb5c64eb8edc4bd432..5f55375815aae220ed6dc4f4f362f73c5674b1cd 100644
--- a/cmd/snap/cmd_services_test.go
+++ b/cmd/snap/cmd_services_test.go
@@ -42,7 +42,7 @@ var _ = check.Suite(&appOpSuite{})
 func (s *appOpSuite) SetUpTest(c *check.C) {
 	s.BaseSnapSuite.SetUpTest(c)
 
-	restoreClientRetry := client.MockDoTimings(time.Millisecond, 100*time.Millisecond)
+	restoreClientRetry := client.MockDoTimings(time.Millisecond, time.Second)
 	restorePollTime := snap.MockPollTime(time.Millisecond)
 	s.AddCleanup(restoreClientRetry)
 	s.AddCleanup(restorePollTime)
diff --git a/cmd/snap/cmd_snap_op_test.go b/cmd/snap/cmd_snap_op_test.go
index 13533a7a0604fe2b5ee6203fd48e958efdd9a5d5..6f407799af3ade2601c4c59892566d703ba46a05 100644
--- a/cmd/snap/cmd_snap_op_test.go
+++ b/cmd/snap/cmd_snap_op_test.go
@@ -101,7 +101,7 @@ type SnapOpSuite struct {
 func (s *SnapOpSuite) SetUpTest(c *check.C) {
 	s.BaseSnapSuite.SetUpTest(c)
 
-	restoreClientRetry := client.MockDoTimings(time.Millisecond, 100*time.Millisecond)
+	restoreClientRetry := client.MockDoTimings(time.Millisecond, time.Second)
 	restorePollTime := snap.MockPollTime(time.Millisecond)
 	s.restoreAll = func() {
 		restoreClientRetry()
-- 
2.31.0

Places

File 0003-cmd-snap-use-less-aggressive-client-timeouts-in-unit.patch of Package snapd (Revision ab5ceb80209f6b196052693751637414)

Places