From 42081a144161f76be4f2a1218b1fa69563586feb Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Tue, 17 Mar 2020 16:34:39 +0530
Subject: [PATCH] Remove unncessary recover() calls (#14066)

* Remove unncessary recover() calls

A recover which is not called inside a defer will always return nil.
So there's no use of calling it.

And even if we did call it inside a defer, recovering and immediately
panicking does not make sense either. So we just remove it.

* Fixed another instance
---
 api4/apitestlib.go        | 4 ----
 app/helper_test.go        | 3 ---
 migrations/helper_test.go | 3 ---
 web/web_test.go           | 3 ---
 4 files changed, 13 deletions(-)

diff --git a/api4/apitestlib.go b/api4/apitestlib.go
index 5fee871421..6b4aedb35a 100644
--- a/api4/apitestlib.go
+++ b/api4/apitestlib.go
@@ -246,10 +246,6 @@ func (me *TestHelper) TearDown() {
 	me.ShutdownApp()
 
 	utils.EnableDebugLogForTest()
-
-	if err := recover(); err != nil {
-		panic(err)
-	}
 }
 
 var initBasicOnce sync.Once
diff --git a/app/helper_test.go b/app/helper_test.go
index 21ceb3b79b..cd06037dff 100644
--- a/app/helper_test.go
+++ b/app/helper_test.go
@@ -567,9 +567,6 @@ func (me *TestHelper) TearDown() {
 		me.App.InvalidateAllCaches()
 	}
 	me.ShutdownApp()
-	if err := recover(); err != nil {
-		panic(err)
-	}
 	if me.tempWorkspace != "" {
 		os.RemoveAll(me.tempWorkspace)
 	}
diff --git a/migrations/helper_test.go b/migrations/helper_test.go
index 931aca55f4..3e892a6d7e 100644
--- a/migrations/helper_test.go
+++ b/migrations/helper_test.go
@@ -250,9 +250,6 @@ func (me *TestHelper) TearDown() {
 	// Clean all the caches
 	me.App.InvalidateAllCaches()
 	me.Server.Shutdown()
-	if err := recover(); err != nil {
-		panic(err)
-	}
 	if me.tempWorkspace != "" {
 		os.RemoveAll(me.tempWorkspace)
 	}
diff --git a/web/web_test.go b/web/web_test.go
index 6e04453eef..a2f0046a5d 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -158,9 +158,6 @@ func (th *TestHelper) TearDown() {
 		th.App.InvalidateAllCaches()
 	}
 	th.Server.Shutdown()
-	if err := recover(); err != nil {
-		panic(err)
-	}
 }
 
 func TestStaticFilesRequest(t *testing.T) {