[FABG-709] Use full SourceURL in E2E test

Change-Id: I39466dc96c71d3f00cba6037dc882d4bcc4b72ef Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Aug 10, 2018 · d542077 · d542077
1 parent 779a8c1
commit d542077
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/test/integration/e2e/end_to_end.go b/test/integration/e2e/end_to_end.go
@@ -8,7 +8,6 @@ package e2e
 
 import (
 	"strconv"
-	"strings"
 	"testing"
 	"time"
 
@@ -156,12 +155,6 @@ func moveFunds(t *testing.T, client *channel.Client) *fab.CCEvent {
 
 func verifyFundsIsMoved(t *testing.T, client *channel.Client, value []byte, ccEvent *fab.CCEvent) {
 
-	//Fix for issue prev in release test, where 'ccEvent.SourceURL' has event URL
-	if !integration.IsLocal() {
-		portIndex := strings.Index(ccEvent.SourceURL, ":")
-		ccEvent.SourceURL = ccEvent.SourceURL[0:portIndex]
-	}
-
 	newValue := queryCC(t, client, ccEvent.SourceURL)
 	valueInt, err := strconv.Atoi(string(value))
 	if err != nil {

diff --git a/test/integration/e2e/end_to_end_test.go b/test/integration/e2e/end_to_end_test.go
@@ -14,10 +14,13 @@ import (
 )
 
 func TestE2E(t *testing.T) {
-	configPath := integration.GetConfigPath("config_e2e.yaml")
-	//End to End testing
-	Run(t, config.FromFile(configPath))
+	t.Run("Base", func(t *testing.T) {
+		configPath := integration.GetConfigPath("config_e2e.yaml")
+		Run(t, config.FromFile(configPath))
+	})
 
-	//Using setup done set above by end to end test, run below test with new config which has no orderer config inside
-	runWithNoOrdererConfig(t, config.FromFile(integration.GetConfigPath("config_e2e_no_orderer.yaml")))
+	t.Run("NoOrderer", func(t *testing.T) {
+		//Using setup done set above by end to end test, run below test with new config which has no orderer config inside
+		runWithNoOrdererConfig(t, config.FromFile(integration.GetConfigPath("config_e2e_no_orderer.yaml")))
+	})
 }