Test fixes

Author: cwood

bulk_test.go

@@ -15,10 +15,10 @@ func TestBulkResourceModifyDelete(t *testing.T) {
 	}
 
 	team, cleanup := createTeamHelper(t)
-	defer cleanup()
-
 	project, cleanupproj := createProjectHelper(t, team)
+
 	defer cleanupproj()
+	defer cleanup()
 
 	dsnkey, err := client.CreateClientKey(org, project, "testing key")
 	if err != nil {

client_test.go

@@ -30,7 +30,7 @@ func getDefaultOrg() string {
 }
 
 func generateIdentifier(prefix string) string {
-	return fmt.Sprintf("Test %s for go-sentry-api-%d", prefix, rand.Int())
+	return fmt.Sprintf("%s %d", prefix, rand.Int())
 }
 
 func TestClientBadEndpoint(t *testing.T) {

makefile

@@ -13,10 +13,10 @@ devenv:
 	docker run -d --name sentry-redis redis
 	docker run -d --name sentry-postgres -e POSTGRES_PASSWORD=secret -e POSTGRES_USER=sentry postgres
 	sleep 5 # Wait for postgres to bootup
-	docker run -it --rm -e SENTRY_SECRET_KEY='${STUPIDSECRET}' --link sentry-postgres:postgres --link sentry-redis:redis sentry upgrade
-	docker run -d --name my-sentry -e SENTRY_SECRET_KEY='${STUPIDSECRET}' --link sentry-redis:redis --link sentry-postgres:postgres -p 8080:9000 sentry
-	docker run -d --name sentry-cron -e SENTRY_SECRET_KEY='${STUPIDSECRET}' --link sentry-postgres:postgres --link sentry-redis:redis sentry run cron
-	docker run -d --name sentry-worker-1 -e SENTRY_SECRET_KEY='${STUPIDSECRET}' --link sentry-postgres:postgres --link sentry-redis:redis sentry run worker
+	docker run -it --rm -e SENTRY_SECRET_KEY='${STUPIDSECRET}' --link sentry-postgres:postgres --link sentry-redis:redis sentry:latest upgrade
+	docker run -d --name my-sentry -e SENTRY_SECRET_KEY='${STUPIDSECRET}' --link sentry-redis:redis --link sentry-postgres:postgres -p 8080:9000 sentry:latest
+	docker run -d --name sentry-cron -e SENTRY_SECRET_KEY='${STUPIDSECRET}' --link sentry-postgres:postgres --link sentry-redis:redis sentry:latest run cron
+	docker run -d --name sentry-worker-1 -e SENTRY_SECRET_KEY='${STUPIDSECRET}' --link sentry-postgres:postgres --link sentry-redis:redis sentry:latest run worker
 
 devclean:
 	docker kill $$(docker ps -q)

userfeedback_test.go

@@ -13,10 +13,10 @@ func TestUserFeedbackResource(t *testing.T) {
 	}
 
 	team, cleanup := createTeamHelper(t)
-	defer cleanup()
-
 	project, cleanupproj := createProjectHelper(t, team)
+
 	defer cleanupproj()
+	defer cleanup()
 
 	t.Run("Submit user feedback without a issue", func(t *testing.T) {
 		issues, _, _ := client.GetIssues(org, project, nil, nil, nil)