pytest 4.0: fox nodeid parsing regex (see pytest-dev/pytest#4358)

Author: nicoulaj

pytest_csv/column/_utils.py

@@ -21,7 +21,7 @@
 import re
 import six
 
-__NODE_ID__ = re.compile(r'(?P<module>.+)\.py(?:::(?P<class>.+)::.+)?::(?P<function>[^\[]+)(?:\[(?P<params>.*)\])?')
+__NODE_ID__ = re.compile(r'(?P<module>.+)\.py(?:::(?P<class>[^:]+)(?:::.+)?)?::(?P<function>[^\[]+)(?:\[(?P<params>.*)\])?')
 
 
 def parse_node_id(node_id):

tests/test_classes.py

@@ -27,13 +27,15 @@ def test_01(self):
                 assert True
     ''')
 
-    result = testdir.runpytest('--csv', 'tests.csv')
+    result = testdir.runpytest('--csv', 'tests.csv',
+                               '--csv-columns', 'id,module,class,name,file,doc,markers,status,message,duration')
 
     assert_outcomes(result, passed=1)
 
     assert_csv_equal('tests.csv', [
-        (ID, '.*test_in_class.py::TestClass::\(\)::test_01'),
+        (ID, '.*test_in_class.py::TestClass.*::test_01'),
         (MODULE, r'.*test_in_class'),
+        (CLASS, 'TestClass'),
         (NAME, 'test_01'),
         (FILE, r'.*test_in_class.py'),
         (DOC, ''),