Skip to content

Commit 2029bba

Browse files
committed
Remove temporary mechanism for skipping CBOR tests.
The CBOR decode and "appendix a" unit tests cover specific serialization behaviors that were known to be incomplete at the time. Now that all of those cases have been addressed, the mechanism for skipping those tests can be removed.
1 parent 85ede67 commit 2029bba

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
@@ -45,11 +45,6 @@ func TestDecode(t *testing.T) {
4545
into interface{} // prototype for concrete destination type. if nil, decode into empty interface value.
4646
want interface{}
4747
assertOnError func(t *testing.T, e error)
48-
49-
// TODO: Some failing test cases are included for completeness. The next library
50-
// minor version should allow them all to be fixed. In the meantime, this field
51-
// explains the behavior reason for a particular failure.
52-
fixme string
5348
}
5449

5550
// Test cases are grouped by the kind of the CBOR data item being decoded, as enumerated in
@@ -70,13 +65,6 @@ func TestDecode(t *testing.T) {
7065
}
7166

7267
t.Run(fmt.Sprintf("%s/mode=%s", test.name, modeName), func(t *testing.T) {
73-
if test.fixme != "" {
74-
// TODO: Remove this along with the
75-
// fixme field when the last skipped
76-
// test case is passing.
77-
t.Skip(test.fixme)
78-
}
79-
8068
var dst reflect.Value
8169
if test.into == nil {
8270
var i interface{}

0 commit comments

Comments
 (0)