Browse Source

Merge pull request #1688 from aboch/ptst

Fix panic in networkdb test code
Madhu Venugopal 8 years ago
parent
commit
6ebaee9e62
1 changed files with 6 additions and 1 deletions
  1. 6 1
      libnetwork/networkdb/networkdb_test.go

+ 6 - 1
libnetwork/networkdb/networkdb_test.go

@@ -55,7 +55,9 @@ func closeNetworkDBInstances(dbs []*NetworkDB) {
 
 
 func (db *NetworkDB) verifyNodeExistence(t *testing.T, node string, present bool) {
 func (db *NetworkDB) verifyNodeExistence(t *testing.T, node string, present bool) {
 	for i := 0; i < 80; i++ {
 	for i := 0; i < 80; i++ {
+		db.RLock()
 		_, ok := db.nodes[node]
 		_, ok := db.nodes[node]
+		db.RUnlock()
 		if present && ok {
 		if present && ok {
 			return
 			return
 		}
 		}
@@ -72,7 +74,10 @@ func (db *NetworkDB) verifyNodeExistence(t *testing.T, node string, present bool
 
 
 func (db *NetworkDB) verifyNetworkExistence(t *testing.T, node string, id string, present bool) {
 func (db *NetworkDB) verifyNetworkExistence(t *testing.T, node string, id string, present bool) {
 	for i := 0; i < 80; i++ {
 	for i := 0; i < 80; i++ {
-		if nn, nnok := db.networks[node]; nnok {
+		db.RLock()
+		nn, nnok := db.networks[node]
+		db.RUnlock()
+		if nnok {
 			n, ok := nn[id]
 			n, ok := nn[id]
 			if present && ok {
 			if present && ok {
 				return
 				return