From 3ab4a87e91ba6697f45e5ef63888458d3e456e90 Mon Sep 17 00:00:00 2001 From: jubittajohn Date: Mon, 5 Jun 2023 16:40:14 -0400 Subject: [PATCH] Change error condition check to use expected error Signed-off-by: jubittajohn --- internal/resolution/resolver_test.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/resolution/resolver_test.go b/internal/resolution/resolver_test.go index 3079905ab..120f3b4e3 100644 --- a/internal/resolution/resolver_test.go +++ b/internal/resolution/resolver_test.go @@ -19,12 +19,13 @@ import ( func TestOperatorResolver(t *testing.T) { - testEntityCache := map[deppy.Identifier]input.Entity{"operatorhub/prometheus/0.37.0": *input.NewEntity("operatorhub/prometheus/0.37.0", map[string]string{ - "olm.bundle.path": `"quay.io/operatorhubio/prometheus@sha256:3e281e587de3d03011440685fc4fb782672beab044c1ebadc42788ce05a21c35"`, - "olm.channel": "{\"channelName\":\"beta\",\"priority\":0,\"replaces\":\"prometheusoperator.0.32.0\"}", - "olm.gvk": "[{\"group\":\"monitoring.coreos.com\",\"kind\":\"Alertmanager\",\"version\":\"v1\"}, {\"group\":\"monitoring.coreos.com\",\"kind\":\"Prometheus\",\"version\":\"v1\"}]", - "olm.package": "{\"packageName\":\"prometheus\",\"version\":\"0.37.0\"}", - }), + testEntityCache := map[deppy.Identifier]input.Entity{"operatorhub/prometheus/0.37.0": *input.NewEntity( + "operatorhub/prometheus/0.37.0", map[string]string{ + "olm.bundle.path": `"quay.io/operatorhubio/prometheus@sha256:3e281e587de3d03011440685fc4fb782672beab044c1ebadc42788ce05a21c35"`, + "olm.channel": "{\"channelName\":\"beta\",\"priority\":0,\"replaces\":\"prometheusoperator.0.32.0\"}", + "olm.gvk": "[{\"group\":\"monitoring.coreos.com\",\"kind\":\"Alertmanager\",\"version\":\"v1\"}, {\"group\":\"monitoring.coreos.com\",\"kind\":\"Prometheus\",\"version\":\"v1\"}]", + "olm.package": "{\"packageName\":\"prometheus\",\"version\":\"0.37.0\"}", + }), "operatorhub/prometheus/0.47.0": *input.NewEntity("operatorhub/prometheus/0.47.0", map[string]string{ "olm.bundle.path": `"quay.io/operatorhubio/prometheus@sha256:5b04c49d8d3eff6a338b56ec90bdf491d501fe301c9cdfb740e5bff6769a21ed"`, "olm.channel": "{\"channelName\":\"beta\",\"priority\":0,\"replaces\":\"prometheusoperator.0.37.0\"}", @@ -103,7 +104,7 @@ func TestOperatorResolver(t *testing.T) { resolver := resolution.NewOperatorResolver(client, entitySource) solution, err := resolver.Resolve(context.Background()) - if err != nil { + if tt.ExpectedError != nil { assert.Equal(t, err, tt.ExpectedError) assert.Nil(t, solution) } else {