Skip to content

Commit 152a0ca

Browse files
authored
Merge pull request kubernetes#125712 from benluddy/remove-cbor-test-skips
KEP-4222: Remove temporary mechanism for skipping CBOR tests.
2 parents 11446a3 + 2029bba commit 152a0ca

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/appendixa_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ func TestAppendixA(t *testing.T) {
6969
reject string // reason the decoder rejects the example
7070
encoded []byte // re-encoded object (only if different from example encoding)
7171
reasons []string // reasons for re-encode difference
72-
73-
// TODO: The cases with nonempty fixme are known to be not working and fixing them
74-
// is an alpha criteria. They're present and skipped for visibility.
75-
fixme string
7672
}{
7773
{
7874
example: hex("00"),
@@ -558,10 +554,6 @@ func TestAppendixA(t *testing.T) {
558554
},
559555
} {
560556
t.Run(fmt.Sprintf("%x", tc.example), func(t *testing.T) {
561-
if tc.fixme != "" {
562-
t.Skip(tc.fixme) // TODO: Remove once all cases are fixed.
563-
}
564-
565557
var decoded interface{}
566558
err := modes.Decode.Unmarshal(tc.example, &decoded)
567559
if err != nil {

staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/decode_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ func TestDecode(t *testing.T) {
5151
into interface{} // prototype for concrete destination type. if nil, decode into empty interface value.
5252
want interface{}
5353
assertOnError func(t *testing.T, e error)
54-
55-
// TODO: Some failing test cases are included for completeness. The next library
56-
// minor version should allow them all to be fixed. In the meantime, this field
57-
// explains the behavior reason for a particular failure.
58-
fixme string
5954
}
6055

6156
// Test cases are grouped by the kind of the CBOR data item being decoded, as enumerated in
@@ -76,13 +71,6 @@ func TestDecode(t *testing.T) {
7671
}
7772

7873
t.Run(fmt.Sprintf("%s/mode=%s", test.name, modeName), func(t *testing.T) {
79-
if test.fixme != "" {
80-
// TODO: Remove this along with the
81-
// fixme field when the last skipped
82-
// test case is passing.
83-
t.Skip(test.fixme)
84-
}
85-
8674
var dst reflect.Value
8775
if test.into == nil {
8876
var i interface{}

0 commit comments

Comments
 (0)