From b1e70658788bb697645205492ec4fd0ca2d029d8 Mon Sep 17 00:00:00 2001
From: Jacob Severson <jacoba.severson@gmail.com>
Date: Fri, 18 Mar 2016 21:55:33 -0500
Subject: [PATCH] Pulling out the hardcoded test user

---
 builtin/providers/github/provider_test.go     |  3 +
 .../github/resource_github_membership_test.go | 16 ++--
 .../resource_github_team_membership_test.go   | 74 ++++++++++---------
 3 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/builtin/providers/github/provider_test.go b/builtin/providers/github/provider_test.go
index b7e7be59e..ccaf84d26 100644
--- a/builtin/providers/github/provider_test.go
+++ b/builtin/providers/github/provider_test.go
@@ -35,4 +35,7 @@ func testAccPreCheck(t *testing.T) {
 	if v := os.Getenv("GITHUB_ORGANIZATION"); v == "" {
 		t.Fatal("GITHUB_ORGANIZATION must be set for acceptance tests")
 	}
+	if v := os.Getenv("GITHUB_TEST_USER"); v == "" {
+		t.Fatal("GITHUB_TEST_USER must be set for acceptance tests")
+	}
 }
diff --git a/builtin/providers/github/resource_github_membership_test.go b/builtin/providers/github/resource_github_membership_test.go
index 0255ed925..670ccb486 100644
--- a/builtin/providers/github/resource_github_membership_test.go
+++ b/builtin/providers/github/resource_github_membership_test.go
@@ -7,11 +7,20 @@ import (
 	"github.com/google/go-github/github"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"os"
 )
 
 func TestAccGithubMembership_basic(t *testing.T) {
 	var membership github.Membership
 
+	testUser := os.Getenv("GITHUB_TEST_USER")
+	testAccGithubMembershipConfig := fmt.Sprintf(`
+		resource "github_membership" "test_org_membership" {
+			username = "%s"
+			role = "member"
+		}
+	`, testUser)
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
@@ -104,10 +113,3 @@ func testAccCheckGithubMembershipRoleState(n string, membership *github.Membersh
 		return nil
 	}
 }
-
-const testAccGithubMembershipConfig = `
-resource "github_membership" "test_org_membership" {
-	username = "TerraformDummyUser"
-	role = "member"
-}
-`
diff --git a/builtin/providers/github/resource_github_team_membership_test.go b/builtin/providers/github/resource_github_team_membership_test.go
index 39a74b8be..4a12e5c9f 100644
--- a/builtin/providers/github/resource_github_team_membership_test.go
+++ b/builtin/providers/github/resource_github_team_membership_test.go
@@ -7,11 +7,49 @@ import (
 	"github.com/google/go-github/github"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+	"os"
 )
 
 func TestAccGithubTeamMembership_basic(t *testing.T) {
 	var membership github.Membership
 
+	testUser := os.Getenv("GITHUB_TEST_USER")
+	testAccGithubTeamMembershipConfig := fmt.Sprintf(`
+		resource "github_membership" "test_org_membership" {
+			username = "%s"
+			role = "member"
+		}
+
+		resource "github_team" "test_team" {
+			name = "foo"
+			description = "Terraform acc test group"
+		}
+
+		resource "github_team_membership" "test_team_membership" {
+			team_id = "${github_team.test_team.id}"
+			username = "%s"
+			role = "member"
+		}
+	`, testUser, testUser)
+
+	testAccGithubTeamMembershipUpdateConfig := fmt.Sprintf(`
+		resource "github_membership" "test_org_membership" {
+			username = "%s"
+			role = "member"
+		}
+
+		resource "github_team" "test_team" {
+			name = "foo"
+			description = "Terraform acc test group"
+		}
+
+		resource "github_team_membership" "test_team_membership" {
+			team_id = "${github_team.test_team.id}"
+			username = "%s"
+			role = "maintainer"
+		}
+	`, testUser, testUser)
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
@@ -114,39 +152,3 @@ func testAccCheckGithubTeamMembershipRoleState(n, expected string, membership *g
 		return nil
 	}
 }
-
-const testAccGithubTeamMembershipConfig = `
-resource "github_membership" "test_org_membership" {
-	username = "TerraformDummyUser"
-	role = "member"
-}
-
-resource "github_team" "test_team" {
-	name = "foo"
-	description = "Terraform acc test group"
-}
-
-resource "github_team_membership" "test_team_membership" {
-	team_id = "${github_team.test_team.id}"
-	username = "TerraformDummyUser"
-	role = "member"
-}
-`
-
-const testAccGithubTeamMembershipUpdateConfig = `
-resource "github_membership" "test_org_membership" {
-	username = "TerraformDummyUser"
-	role = "member"
-}
-
-resource "github_team" "test_team" {
-	name = "foo"
-	description = "Terraform acc test group"
-}
-
-resource "github_team_membership" "test_team_membership" {
-	team_id = "${github_team.test_team.id}"
-	username = "TerraformDummyUser"
-	role = "maintainer"
-}
-`