diff --git a/go.mod b/go.mod index 46ee8f59..c4c9e4e9 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( ) // replace github.com/networkservicemesh/integration-tests => ../integration-tests -replace github.com/networkservicemesh/integration-tests => github.com/NikitaSkrynnik/integration-tests v0.0.0-20240808090017-4e8320b9bc6d +replace github.com/networkservicemesh/integration-tests => github.com/NikitaSkrynnik/integration-tests v0.0.0-20240808091356-61ed7e621873 require ( github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/tests_single/basic_test.go b/tests_single/basic_test.go index 1789aa52..3a7f95db 100644 --- a/tests_single/basic_test.go +++ b/tests_single/basic_test.go @@ -19,16 +19,10 @@ package single import ( "testing" - "github.com/networkservicemesh/integration-tests/extensions/parallel" - "github.com/networkservicemesh/integration-tests/suites/basic" "github.com/networkservicemesh/integration-tests/suites/highload" "github.com/stretchr/testify/suite" ) -func TestRunBasicSuite(t *testing.T) { - parallel.Run(t, new(basic.Suite)) -} - func TestRunHighloadSuite(t *testing.T) { suite.Run(t, new(highload.Suite)) } diff --git a/tests_single/feature_test.go b/tests_single/feature_test.go deleted file mode 100644 index 4b306ceb..00000000 --- a/tests_single/feature_test.go +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) 2022-2023 Cisco and/or its affiliates. -// -// Copyright (c) 2024 Pragmagic Inc. and/or its affiliates. -// -// SPDX-License-Identifier: Apache-2.0 -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package single - -import ( - "flag" - "testing" - - "github.com/stretchr/testify/suite" - - "github.com/networkservicemesh/integration-tests/extensions/parallel" - "github.com/networkservicemesh/integration-tests/suites/features" -) - -var calicoFlag = flag.Bool("calico", false, "selects calico tests") - -// Disabled tests for Calico-vpp: -// TestMutually_aware_nses - https://github.com/networkservicemesh/integration-k8s-kind/issues/627 -// TestNse_composition - https://github.com/networkservicemesh/integration-k8s-kind/issues/625 -// TestVl3_basic - https://github.com/networkservicemesh/integration-k8s-kind/issues/633 -// TestVl3_scale_from_zero - https://github.com/networkservicemesh/integration-k8s-kind/issues/633 -type calicoFeatureSuite struct { - features.Suite -} - -func (s *calicoFeatureSuite) BeforeTest(suiteName, testName string) { - switch testName { - case - "TestNse_composition", - "TestVl3_basic", - "TestVl3_scale_from_zero": - s.T().Skip() - } -} - -func TestRunFeatureSuite(t *testing.T) { - if *calicoFlag { - suite.Run(t, new(calicoFeatureSuite)) - } else { - featuresSuite := new(features.Suite) - parallel.Run(t, featuresSuite, - parallel.WithRunningTestsSynchronously( - featuresSuite.TestScale_from_zero, - featuresSuite.TestVl3_dns, - featuresSuite.TestVl3_scale_from_zero, - featuresSuite.TestVl3_lb, - featuresSuite.TestNse_composition, - featuresSuite.TestSelect_forwarder, - featuresSuite.TestScaled_registry)) - } -} diff --git a/tests_single/heal_test.go b/tests_single/heal_test.go deleted file mode 100644 index 58cf2fe0..00000000 --- a/tests_single/heal_test.go +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2022 Cisco and/or its affiliates. -// -// SPDX-License-Identifier: Apache-2.0 -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package single - -import ( - "testing" - - "github.com/stretchr/testify/suite" - - "github.com/networkservicemesh/integration-tests/suites/heal" -) - -func TestRunHealSuite(t *testing.T) { - suite.Run(t, new(heal.Suite)) -} diff --git a/tests_single/ipsec_test.go b/tests_single/ipsec_test.go deleted file mode 100644 index c095a4fd..00000000 --- a/tests_single/ipsec_test.go +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 2022-2023 Cisco and/or its affiliates. -// -// SPDX-License-Identifier: Apache-2.0 -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package single - -import ( - "testing" - - "github.com/networkservicemesh/integration-tests/extensions/parallel" - "github.com/networkservicemesh/integration-tests/suites/ipsec_mechanism" -) - -func TestRunIpsecSuite(t *testing.T) { - parallel.Run(t, new(ipsec_mechanism.Suite)) -} diff --git a/tests_single/k8s_monolith_test.go b/tests_single/k8s_monolith_test.go deleted file mode 100644 index f9de3498..00000000 --- a/tests_single/k8s_monolith_test.go +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2022 Cisco and/or its affiliates. -// -// SPDX-License-Identifier: Apache-2.0 -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package single - -import ( - "testing" - - "github.com/stretchr/testify/suite" - - "github.com/networkservicemesh/integration-tests/suites/k8s_monolith" -) - -func TestK8sMonolithSuite(t *testing.T) { - suite.Run(t, new(k8s_monolith.Suite)) -} diff --git a/tests_single/memory_test.go b/tests_single/memory_test.go deleted file mode 100644 index 398e9c86..00000000 --- a/tests_single/memory_test.go +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 2022-2023 Cisco and/or its affiliates. -// -// SPDX-License-Identifier: Apache-2.0 -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package single - -import ( - "testing" - - "github.com/networkservicemesh/integration-tests/extensions/parallel" - "github.com/networkservicemesh/integration-tests/suites/memory" -) - -func TestRunMemorySuite(t *testing.T) { - parallel.Run(t, new(memory.Suite)) -} diff --git a/tests_single/observability_test.go b/tests_single/observability_test.go deleted file mode 100644 index 09e6967c..00000000 --- a/tests_single/observability_test.go +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2022 Cisco and/or its affiliates. -// -// SPDX-License-Identifier: Apache-2.0 -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package single - -import ( - "testing" - - "github.com/stretchr/testify/suite" - - "github.com/networkservicemesh/integration-tests/suites/observability" -) - -func TestRunObservabilitySuite(t *testing.T) { - suite.Run(t, new(observability.Suite)) -} diff --git a/tests_single/ovs_test.go b/tests_single/ovs_test.go deleted file mode 100644 index bd6b490e..00000000 --- a/tests_single/ovs_test.go +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) 2023-2024 Nordix Foundation. -// -// SPDX-License-Identifier: Apache-2.0 -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package single - -import ( - "flag" - "testing" - - "github.com/networkservicemesh/integration-tests/extensions/parallel" - "github.com/networkservicemesh/integration-tests/suites/ovs" -) - -var smartVFFlag = flag.Bool("smart", false, "selects smartVF tests") - -// Disabled tests: -// SmartVF to SmartVF Connection - ../use-cases/SmartVF2SmartVF -// Temporary disabled tests: -// Kernel to Kernel Connection over VLAN Trunking - ../use-cases/Kernel2KernelVLAN -type kindOvsSuite struct { - ovs.Suite -} - -func (s *kindOvsSuite) BeforeTest(suiteName, testName string) { - switch testName { - case - "TestSmartVF2SmartVF", - "TestKernel2KernelVLAN": - s.T().Skip() - } -} - -func TestRunOvsSuite(t *testing.T) { - if !*smartVFFlag { - parallel.Run(t, new(kindOvsSuite)) - } else { - parallel.Run(t, new(ovs.Suite)) - } -} diff --git a/tests_single/rvlan_test.go b/tests_single/rvlan_test.go deleted file mode 100644 index 3e04c417..00000000 --- a/tests_single/rvlan_test.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2022-2023 Cisco and/or its affiliates. -// -// SPDX-License-Identifier: Apache-2.0 -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package single - -import ( - "testing" - - "github.com/networkservicemesh/integration-tests/extensions/parallel" - "github.com/networkservicemesh/integration-tests/suites/remotevlan_ovs" - "github.com/networkservicemesh/integration-tests/suites/remotevlan_vpp" -) - -func TestRunRvlanVPPSuite(t *testing.T) { - parallel.Run(t, new(remotevlan_vpp.Suite)) -} - -func TestRunRvlanOVSSuite(t *testing.T) { - parallel.Run(t, new(remotevlan_ovs.Suite)) -}