Use t.Run for /pkg/cri tests

A majority of the tests in /pkg/cri are testing/validating multiple
things per test (generally spec or options validations). This flow
lends itself well to using *testing.T's Run method to run each thing
as a subtest so `go test` output can actually display which subtest
failed/passed.

Some of the tests in the packages in pkg/cri already did this, but
a bunch simply logged what sub-testcase was currently running without
invoking t.Run.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>

pkg/cri/store/container/status_test.go

@@ -65,8 +65,9 @@ func TestContainerState(t *testing.T) {
 			state: runtime.ContainerState_CONTAINER_EXITED,
 		},
 	} {
-		t.Logf("TestCase %q", c)
-		assertlib.Equal(t, test.state, test.status.State())
+		t.Run(c, func(t *testing.T) {
+			assertlib.Equal(t, test.state, test.status.State())
+		})
 	}
 }
 

pkg/cri/store/image/image_test.go

@@ -221,28 +221,29 @@ func TestImageStore(t *testing.T) {
 			expected: []Image{},
 		},
 	} {
-		t.Logf("TestCase %q", desc)
-		s, err := NewFakeStore([]Image{image})
-		assert.NoError(err)
-		assert.NoError(s.update(test.ref, test.image))
-
-		assert.Len(s.List(), len(test.expected))
-		for _, expect := range test.expected {
-			got, err := s.Get(expect.ID)
+		t.Run(desc, func(t *testing.T) {
+			s, err := NewFakeStore([]Image{image})
 			assert.NoError(err)
-			equal(got, expect)
-			for _, ref := range expect.References {
-				id, err := s.Resolve(ref)
-				assert.NoError(err)
-				assert.Equal(expect.ID, id)
-			}
-		}
+			assert.NoError(s.update(test.ref, test.image))
 
-		if test.image == nil {
-			// Shouldn't be able to index by removed ref.
-			id, err := s.Resolve(test.ref)
-			assert.Equal(errdefs.ErrNotFound, err)
-			assert.Empty(id)
-		}
+			assert.Len(s.List(), len(test.expected))
+			for _, expect := range test.expected {
+				got, err := s.Get(expect.ID)
+				assert.NoError(err)
+				equal(got, expect)
+				for _, ref := range expect.References {
+					id, err := s.Resolve(ref)
+					assert.NoError(err)
+					assert.Equal(expect.ID, id)
+				}
+			}
+
+			if test.image == nil {
+				// Shouldn't be able to index by removed ref.
+				id, err := s.Resolve(test.ref)
+				assert.Equal(errdefs.ErrNotFound, err)
+				assert.Empty(id)
+			}
+		})
 	}
 }