beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DockerSwarmSuite lock portIndex to work around race

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-07-13 03:13:37 +02:00
parent 47a84dcc64
commit c096225e8e
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
integration-cli/check_test.go
View file

@ -304,8 +304,8 @@ func init() {
type DockerSwarmSuite struct { type DockerSwarmSuite struct {
server *httptest.Server server *httptest.Server
ds *DockerSuite ds *DockerSuite
daemonsLock sync.Mutex // protect access to daemons and portIndex
daemons []*daemon.Daemon daemons []*daemon.Daemon
daemonsLock sync.Mutex // protect access to daemons
portIndex int portIndex int
} }
@ -336,8 +336,8 @@ func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemo
d.StartNode(c) d.StartNode(c)
} }
s.portIndex++
s.daemonsLock.Lock() s.daemonsLock.Lock()
s.portIndex++
s.daemons = append(s.daemons, d) s.daemons = append(s.daemons, d)
s.daemonsLock.Unlock() s.daemonsLock.Unlock()
@ -354,9 +354,8 @@ func (s *DockerSwarmSuite) TearDownTest(c *check.C) {
} }
} }
s.daemons = nil s.daemons = nil
s.daemonsLock.Unlock()
s.portIndex = 0 s.portIndex = 0
s.daemonsLock.Unlock()
s.ds.TearDownTest(c) s.ds.TearDownTest(c)
} }