Fix possible data race in geard deployment test

VojtechVitek commented 10 years ago

Fixes the following data race found by go test -race:

WARNING: DATA RACE
Write by goroutine 28:
  sync.raceWrite()
      /usr/lib/golang/src/pkg/sync/race.go:41 +0x35
  sync.(*WaitGroup).Wait()
      /usr/lib/golang/src/pkg/sync/waitgroup.go:120 +0x16d
  net/http/httptest.(*Server).Close()
      /usr/lib/golang/src/pkg/net/http/httptest/server.go:168 +0x6a
  github.com/openshift/geard/deployment.TestNewDeploymentFromURL_Timeout()
      /data/src/github.com/openshift/geard/deployment/deployment_test.go:467 +0x1a5
  testing.tRunner()
      /usr/lib/golang/src/pkg/testing/testing.go:391 +0x10f

Previous read by goroutine 32:
  sync.raceRead()
      /usr/lib/golang/src/pkg/sync/race.go:37 +0x35
  sync.(*WaitGroup).Add()
      /usr/lib/golang/src/pkg/sync/waitgroup.go:60 +0xc1
  net/http/httptest.(*waitGroupHandler).ServeHTTP()
      /usr/lib/golang/src/pkg/net/http/httptest/server.go:198 +0x5e
  net/http.serverHandler.ServeHTTP()
      /usr/lib/golang/src/pkg/net/http/server.go:1597 +0x1ca
  net/http.(*conn).serve()
      /usr/lib/golang/src/pkg/net/http/server.go:1167 +0xc00

[test]

openshift-bot commented 10 years ago

Origin Test Results: FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_geard/179/)

mfojtik commented 10 years ago

LGTM, just one small nit.

VojtechVitek commented 10 years ago

@mfojtik thanks. close() it is. :+1:

[merge]

openshift-bot commented 10 years ago

Origin Merge Results: FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_geard/47/)

VojtechVitek commented 10 years ago

The merge build failed with

error: refs/heads/US2109 does not point to a valid object!
error: refs/heads/a9ae3a90a53 does not point to a valid object!
error: refs/heads/cartridges-new does not point to a valid object!
error: refs/heads/features/mcollective does not point to a valid object!
error: refs/heads/master does not point to a valid object!
error: refs/heads/next_gen_node does not point to a valid object!
error: refs/heads/openshift-origin-release-1 does not point to a valid object!
error: refs/heads/openshift-origin-release-2 does not point to a valid object!
error: refs/heads/openshift-origin-release-3 does not point to a valid object!
error: refs/heads/stage does not point to a valid object!
error: refs/heads/stage-2.0.10 does not point to a valid object!
error: refs/heads/stage-2.0.11 does not point to a valid object!
error: refs/heads/stage-2.0.12 does not point to a valid object!
error: refs/heads/stage-2.0.13 does not point to a valid object!
...

git errors.

re-[merge]

VojtechVitek commented 10 years ago

for { [merge] }

VojtechVitek commented 10 years ago

Waiting for mock HTTP server to start...done
...hang again

re-[merge]

VojtechVitek commented 10 years ago

yet another [merge]

VojtechVitek commented 10 years ago

[merge]

openshift-bot commented 10 years ago

Evaluated for origin up to 6d323ab868289cdec3795eac5c13332b56d303db

openshift / geard

Fix possible data race in geard deployment test #246