refactor: Cleanup/simplify testcases in /pkg/extensions (#1116)

Signed-off-by: Nicol Draghici <idraghic@cisco.com>

fix: Increase coverage when copying files

Signed-off-by: Nicol Draghici <idraghic@cisco.com>
This commit is contained in:
Nicol
2023-01-19 18:54:05 +02:00
committed by GitHub
parent b997176363
commit 70a60b4660
12 changed files with 224 additions and 719 deletions
+7 -23
View File
@@ -4,7 +4,6 @@
package monitoring_test
import (
"context"
"net/http"
"path"
"testing"
@@ -40,9 +39,9 @@ func TestExtensionMetrics(t *testing.T) {
ctlr := api.NewController(conf)
So(ctlr, ShouldNotBeNil)
go startServer(ctlr)
defer stopServer(ctlr)
test.WaitTillServerReady(baseURL)
cm := test.NewControllerManager(ctlr)
cm.StartAndWait(port)
defer cm.StopServer()
// improve code coverage
ctlr.Metrics.SendMetric(baseURL)
@@ -56,10 +55,7 @@ func TestExtensionMetrics(t *testing.T) {
monitoring.IncDownloadCounter(ctlr.Metrics, "alpine")
monitoring.IncUploadCounter(ctlr.Metrics, "alpine")
err := test.CopyFiles("../../../test/data/zot-test", path.Join(rootDir, "alpine"))
if err != nil {
panic(err)
}
test.CopyTestFiles("../../../test/data/zot-test", path.Join(rootDir, "alpine"))
monitoring.SetStorageUsage(ctlr.Metrics, rootDir, "alpine")
monitoring.ObserveStorageLockLatency(ctlr.Metrics, time.Millisecond, rootDir, "RWLock")
@@ -91,9 +87,9 @@ func TestExtensionMetrics(t *testing.T) {
ctlr := api.NewController(conf)
So(ctlr, ShouldNotBeNil)
go startServer(ctlr)
defer stopServer(ctlr)
test.WaitTillServerReady(baseURL)
cm := test.NewControllerManager(ctlr)
cm.StartAndWait(port)
defer cm.StopServer()
So(ctlr.Metrics.IsEnabled(), ShouldBeFalse)
@@ -103,15 +99,3 @@ func TestExtensionMetrics(t *testing.T) {
So(resp.StatusCode(), ShouldEqual, http.StatusNotFound)
})
}
func startServer(c *api.Controller) {
// this blocks
if err := c.Run(context.Background()); err != nil {
return
}
}
func stopServer(c *api.Controller) {
ctx := context.Background()
_ = c.Server.Shutdown(ctx)
}