github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

refactor testapi and test scripts to prepare for multiple API groups.

Browse Source
This commit is contained in:
Chao Xu
2015-09-04 00:06:01 -07:00
parent 49702f9059
commit 9fc79e9d99
109 changed files with 1010 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/integration/auth_test.go
View File

@@ -65,22 +65,22 @@ func getTestTokenAuth() authenticator.Request {
}
func path(resource, namespace, name string) string {
return testapi.ResourcePath(resource, namespace, name)
return testapi.Default.ResourcePath(resource, namespace, name)
}
func pathWithPrefix(prefix, resource, namespace, name string) string {
return testapi.ResourcePathWithPrefix(prefix, resource, namespace, name)
return testapi.Default.ResourcePathWithPrefix(prefix, resource, namespace, name)
}
func timeoutPath(resource, namespace, name string) string {
return addTimeoutFlag(testapi.ResourcePath(resource, namespace, name))
return addTimeoutFlag(testapi.Default.ResourcePath(resource, namespace, name))
}
// Bodies for requests used in subsequent tests.
var aPod string = `
{
"kind": "Pod",
"apiVersion": "` + testapi.Version() + `",
"apiVersion": "` + testapi.Default.Version() + `",
"metadata": {
"name": "a",
"creationTimestamp": null%s
@@ -98,7 +98,7 @@ var aPod string = `
var aRC string = `
{
"kind": "ReplicationController",
"apiVersion": "` + testapi.Version() + `",
"apiVersion": "` + testapi.Default.Version() + `",
"metadata": {
"name": "a",
"labels": {
@@ -131,7 +131,7 @@ var aRC string = `
var aService string = `
{
"kind": "Service",
"apiVersion": "` + testapi.Version() + `",
"apiVersion": "` + testapi.Default.Version() + `",
"metadata": {
"name": "a",
"labels": {
@@ -155,7 +155,7 @@ var aService string = `
var aNode string = `
{
"kind": "Node",
"apiVersion": "` + testapi.Version() + `",
"apiVersion": "` + testapi.Default.Version() + `",
"metadata": {
"name": "a"%s
},
@@ -167,7 +167,7 @@ var aNode string = `
var aEvent string = `
{
"kind": "Event",
"apiVersion": "` + testapi.Version() + `",
"apiVersion": "` + testapi.Default.Version() + `",
"metadata": {
"name": "a"%s
},
@@ -183,7 +183,7 @@ var aEvent string = `
var aBinding string = `
{
"kind": "Binding",
"apiVersion": "` + testapi.Version() + `",
"apiVersion": "` + testapi.Default.Version() + `",
"metadata": {
"name": "a"%s
},
@@ -206,7 +206,7 @@ var emptyEndpoints string = `
var aEndpoints string = `
{
"kind": "Endpoints",
"apiVersion": "` + testapi.Version() + `",
"apiVersion": "` + testapi.Default.Version() + `",
"metadata": {
"name": "a"%s
},
@@ -231,7 +231,7 @@ var aEndpoints string = `
var deleteNow string = `
{
"kind": "DeleteOptions",
"apiVersion": "` + testapi.Version() + `",
"apiVersion": "` + testapi.Default.Version() + `",
"gracePeriodSeconds": 0%s
}
`