Skip to content

Commit 8d23989

Browse files
ksimon1ksimon1
committed
fix: test-with-reports makefile target
the script was checking if module contains go.mod file and if not it skips the module. The go.mod files were removed and only one is kept in the root of the project. This PR removes the check for go.mod file and fixes failing unit tests. Signed-off-by: Karel Simon <ksimon@redhat.com>
1 parent b10a4b3 commit 8d23989

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎modules/disk-uploader/pkg/vmexport/vmexport_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,22 @@ import (
44
"context"
55
"os"
66

7+
"github.com/golang/mock/gomock"
78
. "github.com/onsi/ginkgo/v2"
89
. "github.com/onsi/gomega"
9-
10-
"github.com/golang/mock/gomock"
11-
10+
"go.uber.org/zap"
1211
corev1 "k8s.io/api/core/v1"
1312
"k8s.io/apimachinery/pkg/api/errors"
1413
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1514
fakek8sclient "k8s.io/client-go/kubernetes/fake"
1615

16+
"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-uploader/pkg/vmexport"
17+
"github.com/kubevirt/kubevirt-tekton-tasks/modules/shared/pkg/log"
1718
v1beta1 "kubevirt.io/api/export/v1beta1"
1819
fakecdiclient "kubevirt.io/client-go/containerizeddataimporter/fake"
1920
"kubevirt.io/client-go/kubecli"
2021
kubevirtfake "kubevirt.io/client-go/kubevirt/fake"
2122
cdiv1beta1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
22-
23-
"github.com/kubevirt/kubevirt-tekton-tasks/modules/disk-uploader/pkg/vmexport"
2423
)
2524

2625
var _ = Describe("VMExport", func() {
@@ -95,6 +94,9 @@ var _ = Describe("VMExport", func() {
9594

9695
Describe("WaitUntilVirtualMachineExportReady", func() {
9796
It("should return no error", func() {
97+
//initialize logger, otherwise logging events inside fn panics
98+
log.InitLogger(zap.InfoLevel)
99+
98100
_, err := vmExportClient.ExportV1beta1().VirtualMachineExports(namespace).Create(context.Background(),
99101
&v1beta1.VirtualMachineExport{
100102
ObjectMeta: metav1.ObjectMeta{

‎modules/wait-for-vmi-status/pkg/requirements/lookup_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ var _ = Describe("Lookup", func() {
2525
Entry("nil vm", nil, testSelector, labels.Set{}),
2626
Entry("empty requirements", testobjects.NewTestFedoraCloudVM("fedora").Build(), "", labels.Set{}),
2727
Entry("basic", testobjects.NewTestFedoraCloudVM("fedora").Build(), testSelector, labels.Set{
28-
"metadata.name": "fedora",
29-
"spec.running": "false",
30-
"metadata": "{\"name\":\"fedora\",\"namespace\":\"default\",\"creationTimestamp\":null}",
28+
"metadata.name": "fedora",
29+
"spec.runStrategy": "Halted",
30+
"metadata": "{\"name\":\"fedora\",\"namespace\":\"default\",\"creationTimestamp\":null}",
3131
}),
3232
Entry("with spaces", testobjects.NewTestFedoraCloudVM("fedora").Build(), " metadata.name ", labels.Set{
3333
"metadata.name": "fedora",

‎modules/wait-for-vmi-status/pkg/requirements/requirements_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
. "github.com/onsi/gomega"
88
)
99

10-
const testSelector = "metadata.name in (fedora, ubuntu), spec.running != true, invalid.path notin (1, 2, 3), metadata"
10+
const testSelector = "metadata.name in (fedora, ubuntu), spec.runStrategy != true, invalid.path notin (1, 2, 3), metadata"
1111

1212
func TestLog(t *testing.T) {
1313
RegisterFailHandler(Fail)

‎modules/wait-for-vmi-status/pkg/requirements/requirements_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var _ = Describe("Reruirements", func() {
2323
utilstest.GetRequirement("invalid.path", selection.NotIn, []string{"1", "2", "3"}),
2424
utilstest.GetRequirement("metadata", selection.Exists, []string{}),
2525
utilstest.GetRequirement("metadata.name", selection.In, []string{"fedora", "ubuntu"}),
26-
utilstest.GetRequirement("spec.running", selection.NotEquals, []string{"true"}),
26+
utilstest.GetRequirement("spec.runStrategy", selection.NotEquals, []string{"true"}),
2727
}),
2828
Entry("with spaces", " metadata.name ", labels.Requirements{
2929
utilstest.GetRequirement("metadata.name", selection.Exists, []string{}),
@@ -50,7 +50,7 @@ var _ = Describe("Reruirements", func() {
5050
Entry("vm and empty requirements", testobjects.NewTestFedoraCloudVM("fedora").Build(), labels.Requirements{}, true),
5151
Entry("matches requirements", testobjects.NewTestFedoraCloudVM("fedora").Build(), labels.Requirements{
5252
utilstest.GetRequirement("metadata.name", selection.In, []string{"fedora", "ubuntu"}),
53-
utilstest.GetRequirement("spec.running", selection.NotEquals, []string{"true"}),
53+
utilstest.GetRequirement("spec.runStrategy", selection.NotEquals, []string{"true"}),
5454
}, true),
5555
Entry("does not match requirements", testobjects.NewTestFedoraCloudVM("fedora").Build(), labels.Requirements{
5656
utilstest.GetRequirement("metadata.name", selection.In, []string{"ubuntu", "arch"}),
@@ -59,7 +59,7 @@ var _ = Describe("Reruirements", func() {
5959
utilstest.GetRequirement("invalid.path", selection.In, []string{"1", "2", "3"}),
6060
utilstest.GetRequirement("metadata", selection.Exists, []string{}),
6161
utilstest.GetRequirement("metadata.name", selection.In, []string{"ubuntu", "arch"}),
62-
utilstest.GetRequirement("spec.running", selection.NotEquals, []string{"true"}),
62+
utilstest.GetRequirement("spec.runStrategy", selection.NotEquals, []string{"true"}),
6363
}, false),
6464
)
6565
})

‎scripts/test-with-reports.sh‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,22 @@ rm -rf "${TEST_OUT}" "${COVER_OUT}" "${JUNIT_XML}" "${COVERAGE_HTML}" "${FAKE_GO
2323
mkdir -p "${ARTIFACT_DIR}"
2424

2525
visit "${REPO_DIR}/modules"
26-
for MODULE_DIR in $(ls | grep -vE "^(tests)$"); do
26+
for MODULE_DIR in */ ; do
2727
visit "$MODULE_DIR"
28-
if [ -f go.mod ]; then
29-
DIST_DIR=dist
30-
mkdir -p ${DIST_DIR}
31-
go test -v -coverprofile=${DIST_DIR}/coverage.out -covermode=atomic \
32-
$(go list ./... | grep -v utilstest) | tee ${DIST_DIR}/test.out
33-
CURRENT_RET_CODE=$?
34-
if [ "${CURRENT_RET_CODE}" -ne 0 ]; then
35-
RET_CODE=${CURRENT_RET_CODE}
36-
fi
37-
cat ${DIST_DIR}/test.out >> "${TEST_OUT}"
38-
39-
if [ -f "${COVER_OUT}" ]; then
40-
sed "/^mode.*/d" dist/coverage.out >> "${COVER_OUT}" # remove first line with mode
41-
else
42-
cp ${DIST_DIR}/coverage.out "${COVER_OUT}"
43-
fi
28+
DIST_DIR=dist
29+
mkdir -p ${DIST_DIR}
30+
go test -v -coverprofile=${DIST_DIR}/coverage.out -covermode=atomic \
31+
$(go list ./... | grep -v utilstest) | tee ${DIST_DIR}/test.out
32+
CURRENT_RET_CODE=$?
33+
if [ "${CURRENT_RET_CODE}" -ne 0 ]; then
34+
RET_CODE=${CURRENT_RET_CODE}
35+
fi
36+
cat ${DIST_DIR}/test.out >> "${TEST_OUT}"
37+
38+
if [ -f "${COVER_OUT}" ]; then
39+
sed "/^mode.*/d" dist/coverage.out >> "${COVER_OUT}" # remove first line with mode
40+
else
41+
cp ${DIST_DIR}/coverage.out "${COVER_OUT}"
4442
fi
4543
leave
4644
done

0 commit comments

Comments
 (0)