Skip to content

Commit

Permalink
UPSTREAM: <carry>: Revert: Skip unit tests incompatible with openshif…
Browse files Browse the repository at this point in the history
…t ci

This reverts commit c22611b.
  • Loading branch information
soltysh authored and bertinatto committed Mar 6, 2024
1 parent a1a0730 commit 257409f
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions staging/src/k8s.io/kubectl/pkg/cmd/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package config

import (
"fmt"
"os"
"path"
"reflect"
Expand Down Expand Up @@ -44,11 +45,7 @@ func newRedFederalCowHammerConfig() clientcmdapi.Config {
}
}

// It's not worth making this test compatible given that kubectl/oc is
// maintained in a separate branch of openshift/kubernetes.
/*
func Example_view() {
expectedConfig := newRedFederalCowHammerConfig()
test := configCommandTest{
args: []string{"view"},
Expand Down Expand Up @@ -77,7 +74,6 @@ func Example_view() {
// user:
// token: REDACTED
}
*/

func TestCurrentContext(t *testing.T) {
startingConfig := newRedFederalCowHammerConfig()
Expand All @@ -91,7 +87,6 @@ func TestCurrentContext(t *testing.T) {
}

func TestSetCurrentContext(t *testing.T) {

expectedConfig := newRedFederalCowHammerConfig()
startingConfig := newRedFederalCowHammerConfig()

Expand Down Expand Up @@ -980,11 +975,6 @@ func (test configCommandTest) checkOutput(out string, expectedOutputs []string,
}

func (test configCommandTest) run(t *testing.T) string {
// It's not worth making these tests compatible given that
// kubectl/oc is maintained in a separate branch of
// openshift/kubernetes.
t.Skip("Not compatible with openshift ci")

out, actualConfig := testConfigCommand(test.args, test.startingConfig, t)

testSetNilMapsToEmpties(reflect.ValueOf(&test.expectedConfig))
Expand Down

0 comments on commit 257409f

Please sign in to comment.