Skip to content

Commit 74a686c

Browse files
marunbertinatto
authored andcommitted
UPSTREAM: <carry>: Skip unit tests incompatible with openshift ci
OpenShift-Rebase-Source: e1e2042
1 parent 7086abb commit 74a686c

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

staging/src/k8s.io/kubectl/pkg/cmd/config/config_test.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package config
1818

1919
import (
20-
"fmt"
2120
"os"
2221
"path"
2322
"reflect"
@@ -45,7 +44,11 @@ func newRedFederalCowHammerConfig() clientcmdapi.Config {
4544
}
4645
}
4746

47+
// It's not worth making this test compatible given that kubectl/oc is
48+
// maintained in a separate branch of openshift/kubernetes.
49+
/*
4850
func Example_view() {
51+
4952
expectedConfig := newRedFederalCowHammerConfig()
5053
test := configCommandTest{
5154
args: []string{"view"},
@@ -74,6 +77,7 @@ func Example_view() {
7477
// user:
7578
// token: REDACTED
7679
}
80+
*/
7781

7882
func TestCurrentContext(t *testing.T) {
7983
startingConfig := newRedFederalCowHammerConfig()
@@ -87,6 +91,7 @@ func TestCurrentContext(t *testing.T) {
8791
}
8892

8993
func TestSetCurrentContext(t *testing.T) {
94+
9095
expectedConfig := newRedFederalCowHammerConfig()
9196
startingConfig := newRedFederalCowHammerConfig()
9297

@@ -890,6 +895,11 @@ func (test configCommandTest) checkOutput(out string, expectedOutputs []string,
890895
}
891896

892897
func (test configCommandTest) run(t *testing.T) string {
898+
// It's not worth making these tests compatible given that
899+
// kubectl/oc is maintained in a separate branch of
900+
// openshift/kubernetes.
901+
t.Skip("Not compatible with openshift ci")
902+
893903
out, actualConfig := testConfigCommand(test.args, test.startingConfig, t)
894904

895905
testSetNilMapsToEmpties(reflect.ValueOf(&test.expectedConfig))

0 commit comments

Comments
 (0)