Skip ssh tests

Skip ssh tests and correct error msg that's different on server.
This commit is contained in:
Anna Song
2022-05-05 09:26:44 -07:00
parent 271f393218
commit 17b42a99f5

View File

@@ -20,7 +20,7 @@ const resourcesField = `resources:
- %s` - %s`
const resourceErrorFormat = "accumulating resources: accumulation err='accumulating resources from '%s': " const resourceErrorFormat = "accumulating resources: accumulation err='accumulating resources from '%s': "
const fileError = "evalsymlink failure" const fileError = "evalsymlink failure"
const repoFindError = "URL is a git repository': hit 27s timeout running" const repoFindError = "URL is a git repository"
const multibaseDevExampleBuild = `apiVersion: v1 const multibaseDevExampleBuild = `apiVersion: v1
kind: Pod kind: Pod
@@ -131,18 +131,21 @@ func TestRemoteResourceSsh(t *testing.T) {
// skip all tests until server has ssh keys // skip all tests until server has ssh keys
tests := map[string]remoteResourceCase{ tests := map[string]remoteResourceCase{
"scp shorthand": { "scp shorthand": {
skip: true,
kustomization: ` kustomization: `
resources: resources:
- git@github.com:kubernetes-sigs/kustomize//examples/multibases/dev/?ref=v1.0.6`, - git@github.com:kubernetes-sigs/kustomize//examples/multibases/dev/?ref=v1.0.6`,
expected: multibaseDevExampleBuild, expected: multibaseDevExampleBuild,
}, },
"full ssh, no ending slash": { "full ssh, no ending slash": {
skip: true,
kustomization: ` kustomization: `
resources: resources:
- ssh://git@github.com/kubernetes-sigs/kustomize//examples/multibases/dev?ref=v1.0.6`, - ssh://git@github.com/kubernetes-sigs/kustomize//examples/multibases/dev?ref=v1.0.6`,
expected: multibaseDevExampleBuild, expected: multibaseDevExampleBuild,
}, },
"repo": { "repo": {
skip: true,
kustomization: ` kustomization: `
resources: resources:
- ssh://git@github.com/annasong20/kustomize-test.git?ref=main`, - ssh://git@github.com/annasong20/kustomize-test.git?ref=main`,
@@ -168,6 +171,7 @@ func TestRemoteResourcePort(t *testing.T) {
// ports not currently supported; should implement in future // ports not currently supported; should implement in future
tests := map[string]remoteResourceCase{ tests := map[string]remoteResourceCase{
"ssh": { "ssh": {
skip: true,
kustomization: fmt.Sprintf(resourcesField, sshURL), kustomization: fmt.Sprintf(resourcesField, sshURL),
error: true, error: true,
expected: fmt.Sprintf(resourceErrorFormat+fileError, sshURL), expected: fmt.Sprintf(resourceErrorFormat+fileError, sshURL),
@@ -198,6 +202,7 @@ resources:
expected: multibaseDevExampleBuild, expected: multibaseDevExampleBuild,
}, },
"ssh, no ref": { "ssh, no ref": {
skip: true,
kustomization: ` kustomization: `
resources: resources:
- git@github.com:annasong20/kustomize-test.git`, - git@github.com:annasong20/kustomize-test.git`,
@@ -246,11 +251,13 @@ resources:
expected: multibaseDevExampleBuild, expected: multibaseDevExampleBuild,
}, },
"ssh no params": { "ssh no params": {
skip: true,
kustomization: fmt.Sprintf(resourcesField, sshNoParams), kustomization: fmt.Sprintf(resourcesField, sshNoParams),
error: true, error: true,
expected: fmt.Sprintf(resourceErrorFormat+fileError, sshNoParams), expected: fmt.Sprintf(resourceErrorFormat+fileError, sshNoParams),
}, },
"ssh all params": { "ssh all params": {
skip: true,
kustomization: ` kustomization: `
resources: resources:
- ssh://git@github.com/annasong20/kustomize-test.git?ref=main&timeout=10&submodules=true`, - ssh://git@github.com/annasong20/kustomize-test.git?ref=main&timeout=10&submodules=true`,