Make it more clear when a conversion error was unexpected or missing

Author: carolynvs

cmd/dep/glide_importer_test.go

@@ -174,7 +174,7 @@ func TestGlideConfig_Convert(t *testing.T) {
 			manifest, lock, convertErr := g.convert(testCase.projectRoot)
 			err := validateConvertTestCase(testCase.convertTestCase, manifest, lock, convertErr)
 			if err != nil {
-				t.Fatalf("%+v", err)
+				t.Fatalf("%#v", err)
 			}
 		})
 	}

cmd/dep/godep_importer_test.go

@@ -141,7 +141,7 @@ func TestGodepConfig_Convert(t *testing.T) {
 			manifest, lock, convertErr := g.convert(testCase.projectRoot)
 			err := validateConvertTestCase(testCase.convertTestCase, manifest, lock, convertErr)
 			if err != nil {
-				t.Fatalf("%+v", err)
+				t.Fatalf("%#v", err)
 			}
 		})
 	}

cmd/dep/root_analyzer_test.go

@@ -171,14 +171,17 @@ type convertTestCase struct {
 // validateConvertTestCase returns an error if any of the importer's
 // conversion validations failed.
 func validateConvertTestCase(testCase *convertTestCase, manifest *dep.Manifest, lock *dep.Lock, convertErr error) error {
-	if convertErr != nil {
-		if testCase.wantConvertErr {
-			return nil
+	if testCase.wantConvertErr {
+		if convertErr == nil {
+			return errors.New("Expected the conversion to fail, but it did not return an error")
 		}
+		return nil
+	}
 
-		return convertErr
+	if convertErr != nil {
+		return errors.Wrap(convertErr, "Expected the conversion to pass, but it returned an error")
 	}
-	
+
 	// Ignored projects checks.
 	if len(manifest.Ignored) != testCase.wantIgnoreCount {
 		return errors.Errorf("Expected manifest to have %d ignored project(s), got %d",