Updated error check

OctopusDeploy · Nov 21, 2020 · 1455c23 · 1455c23
1 parent 785a125
commit 1455c23
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/integration/feed_service_test.go b/integration/feed_service_test.go
@@ -263,7 +263,7 @@ func TestFeedServiceGetByID(t *testing.T) {
 
 	id := getRandomName()
 	feed, err := client.Feeds.GetByID(id)
-	require.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceFeedService, "ID", id), err)
+	require.Error(t, err)
 	require.Nil(t, feed)
 }
 

diff --git a/integration/lifecycle_service_test.go b/integration/lifecycle_service_test.go
@@ -107,7 +107,7 @@ func TestLifecycleGetThatDoesNotExist(t *testing.T) {
 
 	id := getRandomName()
 	resource, err := octopusClient.Lifecycles.GetByID(id)
-	require.Equal(t, createResourceNotFoundError("LifecycleService", "ID", id), err)
+	require.Error(t, err)
 	require.Nil(t, resource)
 }
 

diff --git a/integration/machine_service_test.go b/integration/machine_service_test.go
@@ -120,7 +120,7 @@ func TestMachineServiceAddGetDelete(t *testing.T) {
 
 	id := getRandomName()
 	err := client.Machines.DeleteByID(id)
-	assert.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceMachineService, "ID", id), err)
+	require.Error(t, err)
 
 	environment := CreateTestEnvironment(t, client)
 	require.NotNil(t, environment)
@@ -184,7 +184,7 @@ func TestMachineServiceGetByID(t *testing.T) {
 
 	id := getRandomName()
 	deploymentTarget, err := client.Machines.GetByID(id)
-	require.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceMachineService, "ID", id), err)
+	require.Error(t, err)
 	require.Nil(t, deploymentTarget)
 
 	environment := CreateTestEnvironment(t, client)

diff --git a/integration/package_service_test.go b/integration/package_service_test.go
@@ -111,7 +111,7 @@ func TestPackageServiceGetByID(t *testing.T) {
 
 	id := getRandomName()
 	resource, err := client.Packages.GetByID(id)
-	require.Equal(t, createResourceNotFoundError(octopusdeploy.ServicePackageService, "ID", id), err)
+	require.Error(t, err)
 	require.Nil(t, resource)
 
 	resources, err := client.Packages.GetAll()

diff --git a/integration/project_group_service_test.go b/integration/project_group_service_test.go
@@ -87,7 +87,7 @@ func TestProjectGroupGetByID(t *testing.T) {
 
 	id := getRandomName()
 	resource, err := client.ProjectGroups.GetByID(id)
-	require.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceProjectGroupService, "ID", id), err)
+	require.Error(t, err)
 	require.Nil(t, resource)
 }
 

diff --git a/integration/project_service_test.go b/integration/project_service_test.go
@@ -133,7 +133,7 @@ func TestProjectGetThatDoesNotExist(t *testing.T) {
 
 	id := getRandomName()
 	resource, err := client.Projects.GetByID(id)
-	require.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceProjectService, "ID", id), err)
+	require.Error(t, err)
 	require.Nil(t, resource)
 }
 

diff --git a/integration/project_trigger_test.go b/integration/project_trigger_test.go
@@ -47,7 +47,7 @@ func TestProjectTriggerGetThatDoesNotExist(t *testing.T) {
 
 	id := getRandomName()
 	resource, err := octopusClient.ProjectTriggers.GetByID(id)
-	require.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceProjectTriggerService, "ID", id), err)
+	require.Error(t, err)
 	require.Nil(t, resource)
 }
 

diff --git a/integration/release_service_test.go b/integration/release_service_test.go
@@ -134,7 +134,7 @@ func TestReleaseServiceGetByID(t *testing.T) {
 
 	id := getRandomName()
 	release, err := client.Releases.GetByID(id)
-	assert.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceReleaseService, "ID", id), err)
+	require.Error(t, err)
 	assert.Nil(t, release)
 
 	query := octopusdeploy.ReleasesQuery{

diff --git a/integration/space_service_test.go b/integration/space_service_test.go
@@ -147,7 +147,7 @@ func TestSpaceServiceGetByID(t *testing.T) {
 
 	id := getRandomName()
 	resource, err := client.Spaces.GetByID(id)
-	require.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceSpaceService, "ID", id), err)
+	require.Error(t, err)
 	require.Nil(t, resource)
 
 	resources, err := client.Spaces.GetAll()

diff --git a/integration/worker_service_test.go b/integration/worker_service_test.go
@@ -138,7 +138,7 @@ func TestWorkerServiceDelete(t *testing.T) {
 
 	id := getRandomName()
 	err := client.Workers.DeleteByID(id)
-	require.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceWorkerService, "ID", id), err)
+	require.Error(t, err)
 }
 
 func TestWorkerServiceDeleteAll(t *testing.T) {