Merge pull request #12417 from hashicorp/tests-remove-08-groups-services

tests: remove update 08 groups services test
hashicorp · Mar 31, 2022 · 845ab88 · 845ab88
2 parents 83d3817 + efb978e
commit 845ab88
Showing 1 changed file with 0 additions and 103 deletions.
diff --git a/client/allocrunner/groupservice_hook_test.go b/client/allocrunner/groupservice_hook_test.go
@@ -1,12 +1,9 @@
 package allocrunner
 
 import (
-	"io/ioutil"
 	"testing"
 	"time"
 
-	consulapi "github.com/hashicorp/consul/api"
-	ctestutil "github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/nomad/ci"
 	"github.com/hashicorp/nomad/client/allocrunner/interfaces"
 	regMock "github.com/hashicorp/nomad/client/serviceregistration/mock"
@@ -290,103 +287,3 @@ func TestGroupServiceHook_getWorkloadServices(t *testing.T) {
 	services := h.getWorkloadServices()
 	require.Len(t, services.Services, 1)
 }
-
-// TestGroupServiceHook_Update08Alloc asserts that adding group services to a previously
-// 0.8 alloc works.
-//
-// COMPAT(0.11) Only valid for upgrades from 0.8.
-func TestGroupServiceHook_Update08Alloc(t *testing.T) {
-	// Create an embedded Consul server
-	testconsul, err := ctestutil.NewTestServerConfigT(t, func(c *ctestutil.TestServerConfig) {
-		// If -v wasn't specified squelch consul logging
-		if !testing.Verbose() {
-			c.Stdout = ioutil.Discard
-			c.Stderr = ioutil.Discard
-		}
-	})
-	if err != nil {
-		t.Fatalf("error starting test consul server: %v", err)
-	}
-	defer testconsul.Stop()
-
-	consulConfig := consulapi.DefaultConfig()
-	consulConfig.Address = testconsul.HTTPAddr
-	consulClient, err := consulapi.NewClient(consulConfig)
-	require.NoError(t, err)
-	namespacesClient := agentconsul.NewNamespacesClient(consulClient.Namespaces(), consulClient.Agent())
-
-	logger := testlog.HCLogger(t)
-	serviceClient := agentconsul.NewServiceClient(consulClient.Agent(), namespacesClient, testlog.HCLogger(t), true)
-
-	regWrapper := wrapper.NewHandlerWrapper(
-		logger,
-		serviceClient,
-		regMock.NewServiceRegistrationHandler(logger),
-	)
-
-	// Lower periodicInterval to ensure periodic syncing doesn't improperly
-	// remove Connect services.
-	//const interval = 50 * time.Millisecond
-	//serviceClient.periodicInterval = interval
-
-	// Disable deregistration probation to test syncing
-	//serviceClient.deregisterProbationExpiry = time.Time{}
-
-	go serviceClient.Run()
-	defer serviceClient.Shutdown()
-
-	// Create new 0.10-style alloc
-	alloc := mock.Alloc()
-	alloc.AllocatedResources.Shared.Networks = []*structs.NetworkResource{
-		{
-			Mode: "bridge",
-			IP:   "10.0.0.1",
-			DynamicPorts: []structs.Port{
-				{
-					Label: "connect-proxy-testconnect",
-					Value: 9999,
-					To:    9998,
-				},
-			},
-		},
-	}
-	tg := alloc.Job.LookupTaskGroup(alloc.TaskGroup)
-	tg.Services = []*structs.Service{
-		{
-			Name:      "testconnect",
-			Provider:  "consul",
-			PortLabel: "9999",
-			Connect: &structs.ConsulConnect{
-				SidecarService: &structs.ConsulSidecarService{
-					Proxy: &structs.ConsulProxy{
-						LocalServicePort: 9000,
-					},
-				},
-			},
-		},
-	}
-
-	// Create old 0.8-style alloc from new alloc
-	oldAlloc := alloc.Copy()
-	oldAlloc.AllocatedResources = nil
-	oldAlloc.Job.LookupTaskGroup(alloc.TaskGroup).Services = nil
-
-	// Create the group service hook
-	h := newGroupServiceHook(groupServiceHookConfig{
-		alloc:             oldAlloc,
-		serviceRegWrapper: regWrapper,
-		restarter:         agentconsul.NoopRestarter(),
-		taskEnvBuilder:    taskenv.NewBuilder(mock.Node(), oldAlloc, nil, oldAlloc.Job.Region),
-		logger:            testlog.HCLogger(t),
-	})
-
-	require.NoError(t, h.Prerun())
-	require.NoError(t, h.Update(&interfaces.RunnerUpdateRequest{Alloc: alloc}))
-
-	// Assert the group and sidecar services are registered
-	require.Eventually(t, func() bool {
-		services, err := consulClient.Agent().Services()
-		require.NoError(t, err)
-		return len(services) == 2
-	}, 3*time.Second, 100*time.Millisecond)
-}