github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

fix all tests

Browse Source
This commit is contained in:
Mike Danese 2015-07-14 15:57:41 -07:00
parent b98df5d12e
commit 337772a91f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/common.sh Normal file → Executable file
View File

@ -332,7 +332,7 @@ function kube::build::source_targets() {
api api
build build
cmd cmd
docs/getting-started-guides docs
examples examples
Godeps/_workspace/src Godeps/_workspace/src
Godeps/Godeps.json Godeps/Godeps.json
@ -770,6 +770,7 @@ function kube::release::package_full_tarball() {
cp -R "${KUBE_ROOT}/third_party/htpasswd" "${release_stage}/third_party/htpasswd" cp -R "${KUBE_ROOT}/third_party/htpasswd" "${release_stage}/third_party/htpasswd"
cp -R "${KUBE_ROOT}/examples" "${release_stage}/" cp -R "${KUBE_ROOT}/examples" "${release_stage}/"
cp -R "${KUBE_ROOT}/docs" "${release_stage}/"
cp "${KUBE_ROOT}/README.md" "${release_stage}/" cp "${KUBE_ROOT}/README.md" "${release_stage}/"
cp "${KUBE_ROOT}/LICENSE" "${release_stage}/" cp "${KUBE_ROOT}/LICENSE" "${release_stage}/"
cp "${KUBE_ROOT}/Vagrantfile" "${release_stage}/" cp "${KUBE_ROOT}/Vagrantfile" "${release_stage}/"

1
examples/examples_test.go
View File

@ -205,7 +205,6 @@ func TestExampleObjectSchemas(t *testing.T) {
"replication": &api.ReplicationController{}, "replication": &api.ReplicationController{},
}, },
"../examples": { "../examples": {
"pod": &api.Pod{},
"scheduler-policy-config": &schedulerapi.Policy{}, "scheduler-policy-config": &schedulerapi.Policy{},
}, },
"../examples/rbd/secret": { "../examples/rbd/secret": {

2
hack/test-update-storage-objects.sh
View File

@ -93,7 +93,7 @@ startApiServer
# Create a pod # Create a pod
kube::log::status "Creating a pod" kube::log::status "Creating a pod"
${KUBECTL} create -f examples/pod.yaml ${KUBECTL} create -f docs/user-guide/pod.yaml
killApiServer killApiServer

6
test/e2e/kubectl.go
View File

@ -79,7 +79,7 @@ var _ = Describe("Kubectl client", func() {
Describe("Update Demo", func() { Describe("Update Demo", func() {
var updateDemoRoot, nautilusPath, kittenPath string var updateDemoRoot, nautilusPath, kittenPath string
BeforeEach(func() { BeforeEach(func() {
updateDemoRoot = filepath.Join(testContext.RepoRoot, "examples/update-demo") updateDemoRoot = filepath.Join(testContext.RepoRoot, "docs/user-guide/update-demo")
nautilusPath = filepath.Join(updateDemoRoot, "nautilus-rc.yaml") nautilusPath = filepath.Join(updateDemoRoot, "nautilus-rc.yaml")
kittenPath = filepath.Join(updateDemoRoot, "kitten-rc.yaml") kittenPath = filepath.Join(updateDemoRoot, "kitten-rc.yaml")
}) })
@ -142,7 +142,7 @@ var _ = Describe("Kubectl client", func() {
var podPath string var podPath string
BeforeEach(func() { BeforeEach(func() {
podPath = filepath.Join(testContext.RepoRoot, "examples/pod.yaml") podPath = filepath.Join(testContext.RepoRoot, "docs/user-guide/pod.yaml")
By("creating the pod") By("creating the pod")
runKubectl("create", "-f", podPath, fmt.Sprintf("--namespace=%v", ns)) runKubectl("create", "-f", podPath, fmt.Sprintf("--namespace=%v", ns))
checkPodsRunningReady(c, ns, []string{simplePodName}, podStartTimeout) checkPodsRunningReady(c, ns, []string{simplePodName}, podStartTimeout)
@ -206,7 +206,7 @@ var _ = Describe("Kubectl client", func() {
var podPath string var podPath string
var nsFlag string var nsFlag string
BeforeEach(func() { BeforeEach(func() {
podPath = filepath.Join(testContext.RepoRoot, "examples/pod.yaml") podPath = filepath.Join(testContext.RepoRoot, "docs/user-guide/pod.yaml")
By("creating the pod") By("creating the pod")
nsFlag = fmt.Sprintf("--namespace=%v", ns) nsFlag = fmt.Sprintf("--namespace=%v", ns)
runKubectl("create", "-f", podPath, nsFlag) runKubectl("create", "-f", podPath, nsFlag)