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

Cleanup

Browse source
This commit is contained in:
shin- 2013-08-05 19:07:23 +02:00
parent 9159c819c3
commit 2c85b964e3
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
registry/registry_mock_test.go
View file

@ -336,7 +336,6 @@ func TestPing(t *testing.T) {
/* Uncomment this to test Mocked Registry locally with curl
* WARNING: Don't push on the repos uncommented, it'll block the tests
<<<<<<< HEAD
*
func TestWait(t *testing.T) {
log.Println("Test HTTP server ready and waiting:", testHttpServer.URL)
@ -344,12 +343,4 @@ func TestWait(t *testing.T) {
<-c
}
//*/
=======
*/
// func TestWait(t *testing.T) {
// log.Println("Test HTTP server ready and waiting:", testHttpServer.URL)
// c := make(chan int)
// <-c
// }
>>>>>>> Mock registry: Fixed a bug where the index validation path would return a 200 status code instead of the expected 204
//*/