server: Fix unit tests

livepeer · Dec 6, 2021 · 381768f · 381768f
1 parent 69807c4
commit 381768f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/server/segment_rpc.go b/server/segment_rpc.go
@@ -45,7 +45,6 @@ var errFormat = errors.New("unrecognized profile output format")
 var errProfile = errors.New("unrecognized encoder profile")
 var errDuration = errors.New("invalid duration")
 var errCapCompat = errors.New("incompatible capabilities")
-var errTimeout = errors.New("timeout")
 
 var dialTimeout = 2 * time.Second
 

diff --git a/server/segment_rpc_test.go b/server/segment_rpc_test.go
@@ -2001,7 +2001,7 @@ func TestSubmitSegment_Timeout(t *testing.T) {
 	headerTimeout = 100 * time.Millisecond
 	lock.Unlock()
 	_, err = SubmitSegment(sess, seg, 0, false, true)
-	assert.Contains(err.Error(), "header timeout: timeout")
+	assert.Contains(err.Error(), "context canceled")
 
 	// time out body
 	lock.Lock()
@@ -2282,7 +2282,7 @@ func TestSendReqWithTimeout(t *testing.T) {
 	resp, err = sendReqWithTimeout(req, time.Millisecond)
 	wg.Done()
 	assert.Nil(resp)
-	assert.ErrorIs(err, errTimeout)
+	assert.ErrorIs(err, context.Canceled)
 }
 
 func stubTLSServer() (*httptest.Server, *http.ServeMux) {