|
8 | 8 | "github.com/sirupsen/logrus" |
9 | 9 | corev1 "k8s.io/api/core/v1" |
10 | 10 |
|
| 11 | + "github.com/stretchr/testify/assert" |
| 12 | + "github.com/stretchr/testify/require" |
| 13 | + |
11 | 14 | "github.com/jetstack/version-checker/pkg/api" |
12 | 15 | "github.com/jetstack/version-checker/pkg/controller/internal/fake/search" |
13 | 16 | "github.com/jetstack/version-checker/pkg/version/semver" |
@@ -58,6 +61,22 @@ func TestContainer(t *testing.T) { |
58 | 61 | IsLatest: true, |
59 | 62 | }, |
60 | 63 | }, |
| 64 | + "if v0.2.0 is latest version, but sha is in a child, then latest": { |
| 65 | + statusSHA: "localhost:5000/version-checker@sha:123", |
| 66 | + imageURL: "localhost:5000/version-checker:v0.2.0", |
| 67 | + opts: new(api.Options), |
| 68 | + searchResp: &api.ImageTag{ |
| 69 | + Tag: "v0.2.0", |
| 70 | + SHA: "sha:abc1234", |
| 71 | + Children: []*api.ImageTag{{SHA: "sha:123"}}, |
| 72 | + }, |
| 73 | + expResult: &Result{ |
| 74 | + CurrentVersion: "v0.2.0", |
| 75 | + LatestVersion: "v0.2.0", |
| 76 | + ImageURL: "localhost:5000/version-checker", |
| 77 | + IsLatest: true, |
| 78 | + }, |
| 79 | + }, |
61 | 80 | "if v0.2.0@sha:123 is wrong sha, then not latest": { |
62 | 81 | statusSHA: "localhost:5000/version-checker@sha:123", |
63 | 82 | imageURL: "localhost:5000/version-checker:v0.2.0@sha:123", |
@@ -280,14 +299,8 @@ func TestContainer(t *testing.T) { |
280 | 299 | } |
281 | 300 |
|
282 | 301 | result, err := checker.Container(context.TODO(), logrus.NewEntry(logrus.New()), pod, container, test.opts) |
283 | | - if err != nil { |
284 | | - t.Errorf("unexpected error: %s", err) |
285 | | - } |
286 | | - |
287 | | - if !reflect.DeepEqual(test.expResult, result) { |
288 | | - t.Errorf("got unexpected result, exp=%#+v got=%#+v", |
289 | | - test.expResult, result) |
290 | | - } |
| 302 | + require.NoError(t, err) |
| 303 | + assert.Exactly(t, test.expResult, result) |
291 | 304 | }) |
292 | 305 | } |
293 | 306 | } |
|
0 commit comments