Merge "FAB-6091 Build with Go 1.9"

.baseimage-release

@@ -1 +1 @@
-0.3.2
+0.4.1

common/tools/configtxlator/sanitycheck/sanitycheck.go

@@ -28,7 +28,7 @@ import (
 
 type Messages struct {
 	GeneralErrors   []string          `json:"general_errors"`
-	ElementWarnings []*ElementMessage `json:"element_errors"`
+	ElementWarnings []*ElementMessage `json:"element_warnings"`
 	ElementErrors   []*ElementMessage `json:"element_errors"`
 }
 

docs/source/dev-setup/devenv.rst

@@ -24,8 +24,8 @@ Prerequisites
 ~~~~~~~~~~~~~
 
 -  `Git client <https://git-scm.com/downloads>`__
--  `Go <https://golang.org/>`__ - 1.7 or later (for releases before
-   v1.0, 1.6 or later)
+-  `Go <https://golang.org/>`__ - 1.9 or later (for v1.0.X releases, use
+   Go 1.7.X)
 -  For macOS,
    `Xcode <https://itunes.apple.com/us/app/xcode/id497799835?mt=12>`__
    must be installed
@@ -41,7 +41,7 @@ Prerequisites
     brew install gnu-tar --with-default-names
 
 -  (only if using Vagrant) - `Vagrant <https://www.vagrantup.com/>`__ -
-   1.7.4 or later
+   1.9 or later
 -  (only if using Vagrant) -
    `VirtualBox <https://www.virtualbox.org/>`__ - 5.0 or later
 -  BIOS Enabled Virtualization - Varies based on hardware

docs/source/prereqs.rst

@@ -49,12 +49,12 @@ following command from a terminal prompt:
 Go Programming Language
 -----------------------
 
-Hyperledger Fabric uses the Go programming language 1.7.x for many of its
+Hyperledger Fabric uses the Go programming language 1.9.x for many of its
 components.
 
-.. note: Go version 1.8.x will yield test failures
+.. note: building with Go version 1.8.x is not supported
 
-  - `Go <https://golang.org/>`__ - version 1.7.x
+  - `Go <https://golang.org/>`__ - version 1.9.x
 
 Given that we are writing a Go chaincode program, we need to be sure that the
 source code is located somewhere within the ``$GOPATH`` tree. First, you will

examples/e2e_cli/end-to-end.rst

@@ -26,7 +26,7 @@ Prerequisites
 - `Homebrew <https://brew.sh/>`__ - OSX only
 - `Xcode <https://itunes.apple.com/us/app/xcode/id497799835?mt=12>`__ - OSX only (this can take upwards of an hour)
 - `Docker Toolbox <https://docs.docker.com/toolbox/toolbox_install_windows/>`__ - Windows users only
-- `Go <https://golang.org/>`__ - 1.7 or higher
+- `Go <https://golang.org/>`__ - 1.9 or higher
 
 On Windows machines you will also need the following which provides a better alternative to the Windows command prompt:
 

gossip/gossip/gossip_test.go

@@ -1329,6 +1329,10 @@ var runTests = func(g goroutine) bool {
 	return searchInStackTrace("testing.RunTests", g.stack)
 }
 
+var tRunner = func(g goroutine) bool {
+	return searchInStackTrace("testing.tRunner", g.stack)
+}
+
 var waitForTestCompl = func(g goroutine) bool {
 	return searchInStackTrace("waitForTestCompletion", g.stack)
 }
@@ -1365,7 +1369,7 @@ func anyOfPredicates(predicates ...goroutinePredicate) goroutinePredicate {
 
 func shouldNotBeRunningAtEnd(gr goroutine) bool {
 	return !anyOfPredicates(runTests, goExit, testingg, waitForTestCompl, gossipTest,
-		clientConn, connectionLeak, connectionLeak2)(gr)
+		clientConn, connectionLeak, connectionLeak2, tRunner)(gr)
 }
 
 func ensureGoroutineExit(t *testing.T) {

test/tools/PTE/README.md

@@ -52,7 +52,7 @@ To build and test the following prerequisites must be installed first:
     -  node v7 is not currently supported
 - gulp command
     - `npm install -g gulp`
-- go (v1.7 or later)
+- go (v1.9 or later)
     - refer to [Go - Getting Started](https://golang.org/doc/install)
 - others:
     - in Ubuntu: `apt install -y build-essential python libltdl-dev`
@@ -107,7 +107,7 @@ If you do not have access to a Fabric network, please see the section on [Creati
 ### Example
 `./pte_driver.sh userInputs/runCases.txt`
 
-`userInputs/runCases.txt` contains the list of user specified test cases to be executed. Each line is a test case and includes two parameters: **SDK type** and **user input file**.  
+`userInputs/runCases.txt` contains the list of user specified test cases to be executed. Each line is a test case and includes two parameters: **SDK type** and **user input file**.
 
 For instance, a run cases file containing two test cases using the node SDK would be:
 ```
@@ -360,7 +360,7 @@ The output includes network id, thread id, transaction type, total transactions,
             "fcn": "invoke",
             "args": ["put", "a", "string-msg"]
         }
-    },   
+    },
     "SCFile": [
         {"ServiceCredentials":"SCFiles/config-local.json"}
     ]