profiler: tidy after merge

Change-Id: I7d6bdce648cca8f42c8d13b250b4eab4fc9716b8

profiler/integration-test.sh

diff --git a/profiler/integration-test.sh b/profiler/integration-test.sh
index bc3e473..e2f70c1 100644
--- a/profiler/integration-test.sh
+++ b/profiler/integration-test.sh
@@ -9,7 +9,6 @@
 cd git/gocloud
 COMMIT=$(git rev-parse HEAD)
 
-go version
 
 # Set $GOPATH
 export GOPATH="$HOME/go"
@@ -35,4 +34,4 @@
 
 cd $GOCLOUD_HOME/profiler
 go get -t -tags=integration .
-go test -timeout=60m -parallel=4 -tags=integration -run TestAgentIntegration -commit="$COMMIT"
+go test -timeout=60m -parallel=5 -tags=integration -run TestAgentIntegration -commit="$COMMIT"

profiler/profiler_test.go

diff --git a/profiler/profiler_test.go b/profiler/profiler_test.go
index 1b64f9b..8c5cff3 100644
--- a/profiler/profiler_test.go
+++ b/profiler/profiler_test.go
@@ -413,15 +413,6 @@
 		if !testutil.Equal(a.profileTypes, tt.wantProfileTypes) {
 			t.Errorf("initializeAgent() got profile types: %v, want %v", a.profileTypes, tt.wantProfileTypes)
 		}
-
-		wantProfileTypes := []pb.ProfileType{pb.ProfileType_CPU, pb.ProfileType_HEAP, pb.ProfileType_THREADS}
-		if tt.enableMutex {
-			wantProfileTypes = append(wantProfileTypes, pb.ProfileType_CONTENTION)
-		}
-		if !testutil.Equal(a.profileTypes, wantProfileTypes) {
-			t.Errorf("initializeAgent() got profile types: %v, want %v", a.profileTypes, wantProfileTypes)
-		}
-
 	}
 }
 

profiler/proftest/proftest.go

diff --git a/profiler/proftest/proftest.go b/profiler/proftest/proftest.go
index 73601d1..2641fcb 100644
--- a/profiler/proftest/proftest.go
+++ b/profiler/proftest/proftest.go
@@ -144,7 +144,7 @@
 		return err
 	}
 
-	op, err := tr.ComputeService.Instances.Insert(inst.ProjectID, inst.Zone, &compute.Instance{
+	_, err = tr.ComputeService.Instances.Insert(inst.ProjectID, inst.Zone, &compute.Instance{
 		MachineType: fmt.Sprintf("zones/%s/machineTypes/%s", inst.Zone, inst.MachineType),
 		Name:        inst.Name,
 		Disks: []*compute.AttachedDisk{{
@@ -177,28 +177,7 @@
 		}},
 	}).Do()
 
-	// Poll status of the operation to create the instance.
-	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-time.After(20 * time.Second):
-			if op.Status == "DONE" {
-				if op.Error != nil {
-					var errMsgs []string
-					for _, e := range op.Error.Errors {
-						if e.Message != "" {
-							errMsgs = append(errMsgs, e.Message)
-						} else {
-							errMsgs = append(errMsgs, e.Code)
-						}
-					}
-					return fmt.Errorf("Failed to create instance: %v", errMsgs)
-				}
-				return nil
-			}
-		}
-	}
+	return err
 }
 
 // DeleteInstance deletes an instance with project id, name, and zone matched