From 8937e39afde63016c24bc32b6569a478358c8a57 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Mon, 14 Jan 2019 10:34:03 -0500
Subject: [PATCH] Raise TypeError instead of NotImplementedError if not list
 type

---
 src/_pytest/junitxml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_pytest/junitxml.py b/src/_pytest/junitxml.py
index aabce4734..6a02da406 100644
--- a/src/_pytest/junitxml.py
+++ b/src/_pytest/junitxml.py
@@ -71,7 +71,7 @@ def merge_family(left, right):
     for kl, vl in left.items():
         for kr, vr in right.items():
             if not isinstance(vl, list):
-                raise NotImplementedError(type(vl))
+                raise TypeError(type(vl))
             result[kl] = vl + vr
     left.update(result)