From 42d1c36a5c775a37a0173cf315086fde1c1b7dd8 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Thu, 13 Jun 2013 10:25:43 -0700 Subject: [PATCH] Fix merge issue --- tags_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tags_test.go b/tags_test.go index 5d03275909..90bc056406 100644 --- a/tags_test.go +++ b/tags_test.go @@ -17,7 +17,7 @@ func TestLookupImage(t *testing.T) { t.Errorf("Expected 1 image, none found") } - if img, err := runtime.repositories.LookupImage(unitTestImageName + ":" + DEFAULT_TAG); err != nil { + if img, err := runtime.repositories.LookupImage(unitTestImageName + ":" + DEFAULTTAG); err != nil { t.Fatal(err) } else if img == nil { t.Errorf("Expected 1 image, none found")