Merge pull request #652 from strukturag/fix-proxy-config-test-race

Fix race condition when accessing "expected" in proxy_config tests.

proxy_config_test.go

@@ -121,26 +121,27 @@ func (p *mcuProxyForConfig) checkEvent(event *proxyConfigEvent) {
 		}
 	}
 
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
 	if len(p.expected) == 0 {
 		p.t.Errorf("no event expected, got %+v from %s:%d", event, caller.File, caller.Line)
 		return
 	}
 
 	defer func() {
 		if len(p.expected) == 0 {
-			p.mu.Lock()
 			waiters := p.waiters
 			p.waiters = nil
 			p.mu.Unlock()
+			defer p.mu.Lock()
 
 			for _, ch := range waiters {
 				ch <- struct{}{}
 			}
 		}
 	}()
 
-	p.mu.Lock()
-	defer p.mu.Unlock()
 	expected := p.expected[0]
 	p.expected = p.expected[1:]
 	if !reflect.DeepEqual(expected, *event) {