Skip to content

Commit d1e5be5

Browse files
Merge pull request #14687 from liggitt/k8s-unit-tests
Run k8s API unit tests
2 parents 33cc1cf + 2d3b25a commit d1e5be5

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Diff for: hack/test-go.sh

+3-5
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,9 @@ if [[ -n "${package_args}" ]]; then
135135
else
136136
# If no packages are given to test, we need to generate a list of all packages with unit tests
137137
openshift_test_packages="$(list_test_packages_under '*')"
138+
test_packages="${openshift_test_packages}"
138139

139140
kubernetes_path="vendor/k8s.io/kubernetes"
140-
mandatory_kubernetes_packages="./vendor/k8s.io/kubernetes/pkg/api ./vendor/k8s.io/kubernetes/pkg/api/v1"
141-
142-
test_packages="${openshift_test_packages} ${mandatory_kubernetes_packages}"
143141

144142
if [[ -n "${test_kube}" ]]; then
145143
# we need to find all of the kubernetes test suites, excluding those we directly whitelisted before, the end-to-end suite, and
@@ -148,8 +146,6 @@ else
148146
optional_kubernetes_packages="$(find -L vendor/k8s.io/{apimachinery,apiserver,client-go,kube-aggregator,kubernetes} -not \( \
149147
\( \
150148
-path "${kubernetes_path}/staging" \
151-
-o -path "${kubernetes_path}/pkg/api" \
152-
-o -path "${kubernetes_path}/pkg/api/v1" \
153149
-o -path "${kubernetes_path}/test" \
154150
-o -path "${kubernetes_path}/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned" \
155151
-o -path "${kubernetes_path}/pkg/storage/etcd3" \
@@ -158,6 +154,8 @@ else
158154
\) -name '*_test.go' | cut -f 2- -d / | xargs -n1 dirname | sort -u | xargs -n1 printf "./vendor/%s\n")"
159155

160156
test_packages="${test_packages} ${optional_kubernetes_packages}"
157+
else
158+
test_packages="${test_packages} ./vendor/k8s.io/kubernetes/pkg/api/... ./vendor/k8s.io/kubernetes/pkg/apis/..."
161159
fi
162160
fi
163161

Diff for: vendor/k8s.io/kubernetes/pkg/api/v1/pod/util_test.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)