From 31bf5516219ae7d5dd7e663dfde26610bf6db4ba Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Mon, 12 Oct 2020 15:22:35 +0200 Subject: [PATCH] Fix compose module tests --- compose/service/module_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/compose/service/module_test.go b/compose/service/module_test.go index f82a0b34a..ff772e760 100644 --- a/compose/service/module_test.go +++ b/compose/service/module_test.go @@ -12,7 +12,7 @@ import ( "testing" ) -func TestCharts(t *testing.T) { +func TestModules(t *testing.T) { var ( ctx = context.Background() s, err = sqlite3.ConnectInMemory(ctx) @@ -55,44 +55,44 @@ func TestCharts(t *testing.T) { ac: AccessControl(&rbac.ServiceAllowAll{}), } res, err := svc.Create(&types.Chart{Name: "My first chart", NamespaceID: namespaceID}) - req.NoError(unwrapChartInternal(err)) + req.NoError(unwrapModuleInternal(err)) req.NotNil(res) res, err = svc.FindByID(namespaceID, res.ID) - req.NoError(unwrapChartInternal(err)) + req.NoError(unwrapModuleInternal(err)) req.NotNil(res) res, err = svc.FindByHandle(namespaceID, res.Handle) - req.NoError(unwrapChartInternal(err)) + req.NoError(unwrapModuleInternal(err)) req.NotNil(res) res.Name = "Changed" res, err = svc.Update(res) - req.NoError(unwrapChartInternal(err)) + req.NoError(unwrapModuleInternal(err)) req.NotNil(res) req.NotNil(res.UpdatedAt) req.Equal(res.Name, "Changed") res, err = svc.FindByID(namespaceID, res.ID) - req.NoError(unwrapChartInternal(err)) + req.NoError(unwrapModuleInternal(err)) req.NotNil(res) req.Equal(res.Name, "Changed") err = svc.DeleteByID(namespaceID, res.ID) - req.NoError(unwrapChartInternal(err)) + req.NoError(unwrapModuleInternal(err)) req.NotNil(res) // this works because we're allowed to do everything res, err = svc.FindByID(namespaceID, res.ID) - req.NoError(unwrapChartInternal(err)) + req.NoError(unwrapModuleInternal(err)) req.NotNil(res) req.NotNil(res.DeletedAt) }) } -func unwrapChartInternal(err error) error { - g := ChartErrGeneric() +func unwrapModuleInternal(err error) error { + g := ModuleErrGeneric() for { if errors.Is(err, g) { err = errors.Unwrap(err)