@@ -243,6 +243,9 @@ echo "templates: ok"

 [ "$(openshift cli get 2>&1 | grep 'you must provide one or more resources')" ]

 [ "$(openshift kubectl get 2>&1 | grep 'you must provide one or more resources')" ]

+# commands that expect file paths must validate and error out correctly

+[ "$(osc login --certificate-authority=/path/to/invalid 2>&1 | grep 'no such file or directory')" ]

+

 osc get pods --match-server-version

 osc create -f examples/hello-openshift/hello-pod.json

 osc describe pod hello-openshift

@@ -91,14 +91,12 @@ func (o *LoginOptions) gatherServerInfo() error {

 	}

 	// we know the server we are expected to use

-

 	clientCfg, err := o.ClientConfig.ClientConfig()

 	if err != nil {

 		return err

 	}

 	// ping to check if server is reachable

-

 	osClient, err := client.New(clientCfg)

 	if err != nil {

 		return err

@@ -117,6 +115,8 @@ func (o *LoginOptions) gatherServerInfo() error {

 				return fmt.Errorf(clientcmd.GetPrettyMessageFor(result.Error()))

 			}

 			fmt.Println()

+		} else {

+			return result.Error()

 		}

 	}

@@ -11,6 +11,7 @@ const (

 	unknownReason                     = 0

 	noServerFoundReason               = 1

 	certificateAuthorityUnknownReason = 2

+	configurationInvalidReason        = 3

 	certificateAuthorityUnknownMsg = "The server uses a certificate signed by unknown authority. You may need to use the --certificate-authority flag to provide the path to a certificate file for the certificate authority, or --insecure-skip-tls-verify to bypass the certificate check and use insecure connections."

 	notConfiguredMsg               = `OpenShift is not configured. You need to run the login command in order to create a default config for your server and credentials:

@@ -41,6 +42,10 @@ func IsNoServerFound(err error) bool {

 	return detectReason(err) == noServerFoundReason

 }

+func IsConfigurationInvalid(err error) bool {

+	return detectReason(err) == configurationInvalidReason

+}

+

 func IsCertificateAuthorityUnknown(err error) bool {

 	return detectReason(err) == certificateAuthorityUnknownReason

 }

@@ -54,8 +59,10 @@ func detectReason(err error) int {

 		switch {

 		case strings.Contains(err.Error(), "certificate signed by unknown authority"):

 			return certificateAuthorityUnknownReason

-		case clientcmd.IsConfigurationInvalid(err), strings.Contains(err.Error(), "no server found for"):

+		case strings.Contains(err.Error(), "no server defined"):

 			return noServerFoundReason

+		case clientcmd.IsConfigurationInvalid(err):

+			return configurationInvalidReason

 		}

 	}

 	return unknownReason