Fix a bad istio maste merge issue, causing the test to fail. (istio#2131

)

Automatic merge from submit-queue.

Fix a bad master merge issue, causing a test to fail.

Before submitting the PR that adds this test, I did a bad merge with changes in Master. Coincidentally the test was also not included in the bazel BUILD file and therefore presubmit didn't catch it.
thanks @mandarjog for finding this issue.

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
none
```

mixer/test/e2e/BUILD

@@ -18,14 +18,15 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = ["e2e_report_test.go"],
+    srcs = ["e2e_report_test.go", "e2e_apa_test.go"],
     library = ":go_default_library",
     deps = [
         "//mixer/pkg/attribute:go_default_library",
         "//mixer/pkg/server:go_default_library",
         "//mixer/test/spyAdapter:go_default_library",
         "//mixer/test/spyAdapter/template:go_default_library",
         "//mixer/test/spyAdapter/template/report:go_default_library",
+        "//mixer/test/spyAdapter/template/apa:go_default_library",
         "@com_github_davecgh_go_spew//spew:go_default_library",
         "@io_istio_api//mixer/v1:go_default_library",
         "@io_istio_api//mixer/v1/config/descriptor:descriptor",

mixer/test/e2e/e2e_apa_test.go

@@ -210,7 +210,7 @@ func TestApa(t *testing.T) {
 		args.ConfigAPIPort = 0
 		args.Templates = e2eTmpl.SupportedTmplInfo
 		args.Adapters = adapterInfos
-		args.GlobalConfig = reportGlobalCfg
+		args.GlobalConfig = apaGlobalCfg
 		args.ServiceConfig = tt.cfg
 
 		env, err := testEnv.New(args)