Merge pull request #6059 from erikh/fix-tests

Fix race condition in CLI tests: diff was not acquiring a container lock
2014-05-27 13:19:32 -07:00 · 2014-05-27 13:19:32 -07:00 · a605379927
parent 0d9a5ce6dd 8b77e0183e
commit a605379927
1 changed files with 2 additions and 0 deletions
--- a/daemon/container.go
+++ b/daemon/container.go
@ -673,6 +673,8 @@ func (container *Container) Mount() error {
 }

 func (container *Container) Changes() ([]archive.Change, error) {
+	container.Lock()
+	defer container.Unlock()
 	return container.daemon.Changes(container)
 }