Merge pull request #2 from atlassian/cwood/fix-testing-issue

Cwood/fix testing issue

Author: cwood

.travis.yml

@@ -1,7 +1,8 @@
 language: go
 
 go:
-  - 1.7
+  - 1.8
+  - 1.9
   - tip
 
 env:

bulk_test.go

@@ -9,18 +9,20 @@ import (
 
 func TestBulkResourceModifyDelete(t *testing.T) {
 	t.Parallel()
+
+	client := newTestClient(t)
+
 	org, err := client.GetOrganization(getDefaultOrg())
 	if err != nil {
 		t.Fatal(err)
 	}
-	team, err := client.CreateTeam(org, "test team for go project", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	project, err := client.CreateProject(org, team, "Test python project issues", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+
+	team, cleanup := createTeamHelper(t)
+	project, cleanupproj := createProjectHelper(t, team)
+
+	defer cleanupproj()
+	defer cleanup()
+
 	dsnkey, err := client.CreateClientKey(org, project, "testing key")
 	if err != nil {
 		t.Fatal(err)
@@ -32,7 +34,7 @@ func TestBulkResourceModifyDelete(t *testing.T) {
 	}
 
 	for i := 0; i <= 100; i++ {
-		ravenClient.CaptureMessage(fmt.Sprintf("Testing message %d", i), nil, nil)
+		ravenClient.CaptureMessageAndWait(fmt.Sprintf("Testing message %d", i), nil, nil)
 	}
 
 	t.Run("Fetch all messages for project", func(t *testing.T) {
@@ -81,7 +83,4 @@ func TestBulkResourceModifyDelete(t *testing.T) {
 		})
 	})
 
-	if err := client.DeleteTeam(org, team); err != nil {
-		t.Error(err)
-	}
 }

client.go

@@ -75,7 +75,7 @@ func (c *Client) hasError(response *http.Response) error {
 		}
 
 		if err := json.Unmarshal(body, &apierror); err != nil {
-			return err
+			apierror.Detail = string(body)
 		}
 
 		return error(apierror)
@@ -130,6 +130,7 @@ func (c *Client) newRequest(method, endpoint string, in interface{}) (*http.Requ
 	}
 	req.Header.Add("Content-Type", "application/json")
 	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", c.AuthToken))
+	req.Header.Add("Accept", "application/json")
 	req.Close = true
 
 	return req, nil

client_test.go

@@ -1,26 +1,52 @@
 package sentry
 
 import (
+	"fmt"
+	"math/rand"
 	"os"
 	"testing"
 )
 
-var authtoken = os.Getenv("SENTRY_AUTH_TOKEN")
-var endpoint = os.Getenv("SENTRY_ENDPOINT")
-var defaultorg = os.Getenv("SENTRY_DEFAULT_ORG")
-var client, clienterr = NewClient(authtoken, &endpoint, nil)
-
 func getDefaultOrg() string {
+	defaultorg := os.Getenv("SENTRY_DEFAULT_ORG")
+
 	if defaultorg == "" {
 		return "sentry"
 	}
 
 	return defaultorg
 }
 
+func newTestClient(t *testing.T) *Client {
+	authtoken := os.Getenv("SENTRY_AUTH_TOKEN")
+	endpoint := os.Getenv("SENTRY_ENDPOINT")
+
+	if authtoken == "" {
+		t.Fatal("Need a authtoken to continue. Please set SENTRY_AUTH_TOKEN")
+	}
+
+	if endpoint == "" {
+		endpoint = "https://sentry.io/api/0/"
+	}
+
+	client, clienterr := NewClient(authtoken, &endpoint, nil)
+	if clienterr != nil {
+		t.Fatal(clienterr)
+	}
+
+	return client
+}
+
+func generateIdentifier(prefix string) string {
+	return fmt.Sprintf("%s %d", prefix, rand.Int())
+}
+
 func TestClientBadEndpoint(t *testing.T) {
 	t.Parallel()
 	badendpoint := ""
+
+	authtoken := os.Getenv("SENTRY_AUTH_TOKEN")
+
 	_, berr := NewClient(authtoken, &badendpoint, nil)
 	if berr == nil {
 		t.Error("Should have gotten an error for an empty endpoint")

error.go

@@ -6,7 +6,7 @@ import (
 
 // APIError is used when the api returns back a non 200 response
 type APIError struct {
-	Detail     string `json:"detail"`
+	Detail     string `json:"detail,omitempty"`
 	StatusCode int    `json:"-"`
 }
 

events_test.go

@@ -10,18 +10,20 @@ import (
 
 func TestEventsResource(t *testing.T) {
 	t.Parallel()
+
+	client := newTestClient(t)
+
 	org, err := client.GetOrganization(getDefaultOrg())
 	if err != nil {
 		t.Fatal(err)
 	}
-	team, err := client.CreateTeam(org, "test team for go project", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	project, err := client.CreateProject(org, team, "Test go project events resource", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+
+	team, cleanup := createTeamHelper(t)
+	defer cleanup()
+
+	project, cleanupproj := createProjectHelper(t, team)
+	defer cleanupproj()
+
 	dsnkey, err := client.CreateClientKey(org, project, "testing key")
 	if err != nil {
 		t.Fatal(err)
@@ -83,8 +85,4 @@ func TestEventsResource(t *testing.T) {
 
 	})
 
-	if err := client.DeleteTeam(org, team); err != nil {
-		t.Error(err)
-	}
-
 }

file_test.go

@@ -2,23 +2,26 @@ package sentry
 
 import (
 	"bytes"
+	"fmt"
 	"testing"
 )
 
 func TestReleaseFileResource(t *testing.T) {
 	t.Parallel()
+
+	client := newTestClient(t)
+
 	org, err := client.GetOrganization(getDefaultOrg())
 	if err != nil {
 		t.Fatal(err)
 	}
-	team, err := client.CreateTeam(org, "test team for go project", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	project, err := client.CreateProject(org, team, "Test python project", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+
+	team, cleanup := createTeamHelper(t)
+	defer cleanup()
+
+	project, cleanupproj := createProjectHelper(t, team)
+	defer cleanupproj()
+
 	newrelease := NewRelease{
 		Version: "1.0.0",
 	}
@@ -32,16 +35,18 @@ func TestReleaseFileResource(t *testing.T) {
 			Hello World!
 		`
 
+		filename := fmt.Sprintf("%s-example.txt", project.ID)
+
 		file, err := client.UploadReleaseFile(org, project, release,
-			"example.txt",
+			filename,
 			bytes.NewBuffer([]byte(data)),
 			"Content-Type:text/plain; encoding=utf-8")
 
 		if err != nil {
 			t.Error("Failed to save file to sentry", err)
 		}
 
-		if file.Name != "example.txt" {
+		if file.Name != filename {
 			t.Error("File did not save as example.txt")
 		}
 		t.Run("Fetch the release files for this release", func(t *testing.T) {
@@ -83,11 +88,4 @@ func TestReleaseFileResource(t *testing.T) {
 			})
 		})
 	})
-	delprojerr := client.DeleteProject(org, project)
-	if delprojerr != nil {
-		t.Fatal(delprojerr)
-	}
-	if delteam := client.DeleteTeam(org, team); delteam != nil {
-		t.Error(delteam)
-	}
 }

issue_test.go

@@ -1,31 +1,58 @@
 package sentry
 
 import (
+	"fmt"
 	"testing"
+
+	"github.com/getsentry/raven-go"
 )
 
 func TestIssueResource(t *testing.T) {
-	t.Parallel()
+
+	client := newTestClient(t)
 	org, err := client.GetOrganization(getDefaultOrg())
 	if err != nil {
 		t.Fatal(err)
 	}
-	team, err := client.CreateTeam(org, "test team for go project", nil)
+
+	team, cleanup := createTeamHelper(t)
+	defer cleanup()
+
+	project, cleanupproj := createProjectHelper(t, team)
+	defer cleanupproj()
+
+	dsnkey, err := client.CreateClientKey(org, project, "testing key")
 	if err != nil {
 		t.Fatal(err)
 	}
-	project, err := client.CreateProject(org, team, "Test python project issues", nil)
+
+	ravenClient, err := raven.New(dsnkey.DSN.Secret)
 	if err != nil {
 		t.Fatal(err)
 	}
 
+	for i := 0; i <= 10; i++ {
+		ravenClient.CaptureMessage(fmt.Sprintf("Testing message %d", i), nil, nil)
+	}
+
+	t.Run("Get all issues with a query of resolved", func(t *testing.T) {
+		query := "is:resolved"
+		issues, _, err := client.GetIssues(org, project, nil, nil, &query)
+		if err != nil {
+			t.Error(err)
+		}
+		if len(issues) >= 1 {
+			t.Error("Should have not had any issues marked as resolved")
+		}
+	})
+
 	t.Run("Get all issues for a project", func(t *testing.T) {
 		issues, link, err := client.GetIssues(org, project, nil, nil, nil)
 		if err != nil {
 			t.Error(err)
 		}
-		if len(issues) < 0 {
-			t.Error("No issues found for this project")
+		if len(issues) <= 0 {
+			t.Fatal("No issues found for this project")
 		}
 		if link.Previous.Results {
 			t.Error("Should be no new results")

keys_test.go

@@ -6,18 +6,19 @@ import (
 
 func TestKeysResource(t *testing.T) {
 	t.Parallel()
+
+	client := newTestClient(t)
 	org, err := client.GetOrganization(getDefaultOrg())
+
 	if err != nil {
 		t.Fatal(err)
 	}
-	team, err := client.CreateTeam(org, "test team for keys", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	project, err := client.CreateProject(org, team, "Test python project keys", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+
+	team, cleanup := createTeamHelper(t)
+	defer cleanup()
+
+	project, cleanupproj := createProjectHelper(t, team)
+	defer cleanupproj()
 
 	t.Run("Create a new key for project", func(t *testing.T) {
 		key, err := client.CreateClientKey(org, project, "Test client key")
@@ -56,8 +57,4 @@ func TestKeysResource(t *testing.T) {
 		})
 	})
 
-	if err := client.DeleteTeam(org, team); err != nil {
-		t.Error(err)
-	}
-
 }

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)