From a1e2fb3ff225509885f82311096d0353e1117877 Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Mon, 1 Apr 2019 12:47:57 -0700 Subject: Remove build tags Remove build tags as this is causing issues where mock plugins need to be loaded into files that do unit testing as well. Full integration testing is being done in the CSIT. Issue-ID: MULTICLOUD-559 Change-Id: Icd147dac80d16a6fb8f33048c76d4083158cecd2 Signed-off-by: Kiran Kamineni --- src/k8splugin/Makefile | 17 +++++------------ src/k8splugin/api/handler_test.go | 2 -- src/k8splugin/internal/app/client_test.go | 2 -- src/k8splugin/internal/app/vnfhelper_test.go | 2 -- src/k8splugin/internal/db/consul_test.go | 2 -- src/k8splugin/internal/db/mongo_test.go | 2 -- src/k8splugin/internal/db/store_test.go | 2 -- src/k8splugin/internal/db/testing.go | 2 -- src/k8splugin/internal/helm/helm_test.go | 2 -- src/k8splugin/internal/rb/definition_test.go | 2 -- src/k8splugin/internal/rb/profile_test.go | 2 -- src/k8splugin/internal/rb/profile_yaml_test.go | 2 -- src/k8splugin/internal/utils_test.go | 2 -- src/k8splugin/plugins/deployment/plugin_test.go | 2 -- src/k8splugin/plugins/namespace/plugin_test.go | 2 -- src/k8splugin/plugins/network/plugin_test.go | 2 -- src/k8splugin/plugins/ovn4nfvk8s-network/plugin_test.go | 2 -- src/k8splugin/plugins/service/plugin_test.go | 2 -- 18 files changed, 5 insertions(+), 46 deletions(-) (limited to 'src/k8splugin') diff --git a/src/k8splugin/Makefile b/src/k8splugin/Makefile index 3bc7a0e6..d5bdb6fc 100644 --- a/src/k8splugin/Makefile +++ b/src/k8splugin/Makefile @@ -27,17 +27,10 @@ build: clean plugins test cover deploy: build .PHONY: test -test: unit integration - -.PHONY: unit -unit: - @go test -v -tags 'unit' ./... - -.PHONY: integration -integration: clean - @go build -tags 'integration' -buildmode=plugin -o ./mock_files/mock_plugins/mockplugin.so ./mock_files/mock_plugins/mockplugin.go - @go build -tags 'integration' -buildmode=plugin -o ./mock_files/mock_plugins/mocknetworkplugin.so ./mock_files/mock_plugins/mocknetworkplugin.go - @go test -v -tags 'integration' ./... +test: clean + @go build -buildmode=plugin -o ./mock_files/mock_plugins/mockplugin.so ./mock_files/mock_plugins/mockplugin.go + @go build -buildmode=plugin -o ./mock_files/mock_plugins/mocknetworkplugin.so ./mock_files/mock_plugins/mocknetworkplugin.go + @go test -v ./... format: @go fmt ./... @@ -51,5 +44,5 @@ clean: .PHONY: cover cover: - @go test -tags 'unit' ./... -coverprofile=coverage.out + @go test ./... -coverprofile=coverage.out @go tool cover -html=coverage.out -o coverage.html diff --git a/src/k8splugin/api/handler_test.go b/src/k8splugin/api/handler_test.go index ee4a3005..df4d03c3 100644 --- a/src/k8splugin/api/handler_test.go +++ b/src/k8splugin/api/handler_test.go @@ -1,5 +1,3 @@ -// +build unit - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/internal/app/client_test.go b/src/k8splugin/internal/app/client_test.go index 9d892633..71892725 100644 --- a/src/k8splugin/internal/app/client_test.go +++ b/src/k8splugin/internal/app/client_test.go @@ -1,5 +1,3 @@ -// +build unit - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/internal/app/vnfhelper_test.go b/src/k8splugin/internal/app/vnfhelper_test.go index 06866150..6722bfa8 100644 --- a/src/k8splugin/internal/app/vnfhelper_test.go +++ b/src/k8splugin/internal/app/vnfhelper_test.go @@ -1,5 +1,3 @@ -// +build integration - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/internal/db/consul_test.go b/src/k8splugin/internal/db/consul_test.go index abd264c8..139d4f8b 100644 --- a/src/k8splugin/internal/db/consul_test.go +++ b/src/k8splugin/internal/db/consul_test.go @@ -1,5 +1,3 @@ -// +build unit - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/internal/db/mongo_test.go b/src/k8splugin/internal/db/mongo_test.go index 71aaf86e..171c908f 100644 --- a/src/k8splugin/internal/db/mongo_test.go +++ b/src/k8splugin/internal/db/mongo_test.go @@ -1,5 +1,3 @@ -// +build unit - /* * Copyright 2018 Intel Corporation, Inc * diff --git a/src/k8splugin/internal/db/store_test.go b/src/k8splugin/internal/db/store_test.go index eed7065f..5043ea96 100644 --- a/src/k8splugin/internal/db/store_test.go +++ b/src/k8splugin/internal/db/store_test.go @@ -1,5 +1,3 @@ -// +build unit - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/internal/db/testing.go b/src/k8splugin/internal/db/testing.go index ded5067c..1fefd63c 100644 --- a/src/k8splugin/internal/db/testing.go +++ b/src/k8splugin/internal/db/testing.go @@ -1,5 +1,3 @@ -// +build unit integration - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/internal/helm/helm_test.go b/src/k8splugin/internal/helm/helm_test.go index a5bcd9c8..27bb9d79 100644 --- a/src/k8splugin/internal/helm/helm_test.go +++ b/src/k8splugin/internal/helm/helm_test.go @@ -1,5 +1,3 @@ -// +build unit - /* * Copyright 2018 Intel Corporation, Inc * diff --git a/src/k8splugin/internal/rb/definition_test.go b/src/k8splugin/internal/rb/definition_test.go index 96aaafbe..0a9e7c72 100644 --- a/src/k8splugin/internal/rb/definition_test.go +++ b/src/k8splugin/internal/rb/definition_test.go @@ -1,5 +1,3 @@ -// +build unit - /* * Copyright 2018 Intel Corporation, Inc * diff --git a/src/k8splugin/internal/rb/profile_test.go b/src/k8splugin/internal/rb/profile_test.go index 5d41b019..e0f43824 100644 --- a/src/k8splugin/internal/rb/profile_test.go +++ b/src/k8splugin/internal/rb/profile_test.go @@ -1,5 +1,3 @@ -// +build unit - /* * Copyright 2018 Intel Corporation, Inc * diff --git a/src/k8splugin/internal/rb/profile_yaml_test.go b/src/k8splugin/internal/rb/profile_yaml_test.go index c29bf9ed..d72f2c41 100644 --- a/src/k8splugin/internal/rb/profile_yaml_test.go +++ b/src/k8splugin/internal/rb/profile_yaml_test.go @@ -1,5 +1,3 @@ -// +build unit - /* * Copyright 2018 Intel Corporation, Inc * diff --git a/src/k8splugin/internal/utils_test.go b/src/k8splugin/internal/utils_test.go index 6b49d427..58b17bc6 100644 --- a/src/k8splugin/internal/utils_test.go +++ b/src/k8splugin/internal/utils_test.go @@ -1,5 +1,3 @@ -// +build unit - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/plugins/deployment/plugin_test.go b/src/k8splugin/plugins/deployment/plugin_test.go index bfe5fe39..55e0c803 100644 --- a/src/k8splugin/plugins/deployment/plugin_test.go +++ b/src/k8splugin/plugins/deployment/plugin_test.go @@ -1,5 +1,3 @@ -// +build unit - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/plugins/namespace/plugin_test.go b/src/k8splugin/plugins/namespace/plugin_test.go index 2f1475d7..0019df1c 100644 --- a/src/k8splugin/plugins/namespace/plugin_test.go +++ b/src/k8splugin/plugins/namespace/plugin_test.go @@ -1,5 +1,3 @@ -// +build unit - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/plugins/network/plugin_test.go b/src/k8splugin/plugins/network/plugin_test.go index 02391177..5bf649a9 100644 --- a/src/k8splugin/plugins/network/plugin_test.go +++ b/src/k8splugin/plugins/network/plugin_test.go @@ -1,5 +1,3 @@ -// +build integration - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/plugins/ovn4nfvk8s-network/plugin_test.go b/src/k8splugin/plugins/ovn4nfvk8s-network/plugin_test.go index b6b28ea1..ce848a71 100644 --- a/src/k8splugin/plugins/ovn4nfvk8s-network/plugin_test.go +++ b/src/k8splugin/plugins/ovn4nfvk8s-network/plugin_test.go @@ -1,5 +1,3 @@ -// +build unit - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/k8splugin/plugins/service/plugin_test.go b/src/k8splugin/plugins/service/plugin_test.go index b9198914..7353f24b 100644 --- a/src/k8splugin/plugins/service/plugin_test.go +++ b/src/k8splugin/plugins/service/plugin_test.go @@ -1,5 +1,3 @@ -// +build unit - /* Copyright 2018 Intel Corporation. Licensed under the Apache License, Version 2.0 (the "License"); -- cgit 1.2.3-korg