Move the checks in the http handler for timeout

middleware/timeout_test.go

@@ -147,35 +147,31 @@ func TestTimeoutTestRequestClone(t *testing.T) {
 	rec := httptest.NewRecorder()
 
 	m := TimeoutWithConfig(TimeoutConfig{
+		// Timeout has to be defined or the whole flow for timeout middleware will be skipped
 		Timeout: time.Second,
-		ErrorHandler: func(err error, c echo.Context) error {
-			assert.EqualError(t, err, context.DeadlineExceeded.Error())
-
-			// Cookie test
-			cookie, err := c.Request().Cookie("cookie")
-			if assert.NoError(t, err) {
-				assert.EqualValues(t, "cookie", cookie.Name)
-				assert.EqualValues(t, "value", cookie.Value)
-			}
-
-			// Form values
-			if assert.NoError(t, c.Request().ParseForm()) {
-				assert.EqualValues(t, "value", c.Request().FormValue("form"))
-			}
-
-			// Query string
-			assert.EqualValues(t, "value", c.Request().URL.Query()["query"][0])
-			return errors.New("err")
-		},
 	})
 
 	e := echo.New()
 	c := e.NewContext(req, rec)
 
 	err := m(func(c echo.Context) error {
-		time.Sleep(time.Minute)
+		// Cookie test
+		cookie, err := c.Request().Cookie("cookie")
+		if assert.NoError(t, err) {
+			assert.EqualValues(t, "cookie", cookie.Name)
+			assert.EqualValues(t, "value", cookie.Value)
+		}
+
+		// Form values
+		if assert.NoError(t, c.Request().ParseForm()) {
+			assert.EqualValues(t, "value", c.Request().FormValue("form"))
+		}
+
+		// Query string
+		assert.EqualValues(t, "value", c.Request().URL.Query()["query"][0])
 		return nil
 	})(c)
 
-	assert.Error(t, err)
+	assert.NoError(t, err)
+
 }