File tree Expand file tree Collapse file tree 3 files changed +34
-0
lines changed Expand file tree Collapse file tree 3 files changed +34
-0
lines changed Original file line number Diff line number Diff line change @@ -20,6 +20,10 @@ development at the same time, such as 4.5.x and 5.0.
20
20
Unreleased
21
21
----------
22
22
23
+ - Fix a failure when combining data files due to file names containing
24
+ glob-like patterns (`pull 1405 `_). Thanks, Michael Krebs and Benjamin
25
+ Schubert.
26
+
23
27
- Fix a messaging failure when combining Windows data files on a different
24
28
drive than the current directory. (`pull 1430 `_, fixing `issue 1428 `_).
25
29
Thanks, Lorenzo Micò.
@@ -32,6 +36,7 @@ Unreleased
32
36
33
37
.. _issue 972 : https://github.com/nedbat/coveragepy/issues/972
34
38
.. _pull 1347 : https://github.com/nedbat/coveragepy/pull/1347
39
+ .. _pull 1405 : https://github.com/nedbat/coveragepy/issues/1405
35
40
.. _pull 1413 : https://github.com/nedbat/coveragepy/issues/1413
36
41
.. _pull 1428 : https://github.com/nedbat/coveragepy/issues/1428
37
42
.. _pull 1430 : https://github.com/nedbat/coveragepy/pull/1430
Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ Artem Dayneko
23
23
Arthur Deygin
24
24
Ben Carlsson
25
25
Ben Finney
26
+ Benjamin Schubert
26
27
Bernát Gábor
27
28
Bill Hart
28
29
Bradley Burns
@@ -111,6 +112,7 @@ Matthew Boehm
111
112
Matthew Desmarais
112
113
Matus Valo
113
114
Max Linke
115
+ Michael Krebs
114
116
Michał Bultrowicz
115
117
Mickie Betz
116
118
Mike Fiedler
Original file line number Diff line number Diff line change @@ -878,6 +878,33 @@ def test_interleaved_erasing_bug716(self):
878
878
# "no such table: meta"
879
879
covdata2 .add_lines (LINES_1 )
880
880
881
+ @pytest .mark .parametrize (
882
+ "dpart, fpart" ,
883
+ [
884
+ ("" , "[b-a]" ),
885
+ ("[3-1]" , "" ),
886
+ ("[3-1]" , "[b-a]" ),
887
+ ],
888
+ )
889
+ def test_combining_with_crazy_filename (self , dpart , fpart ):
890
+ dirname = f"py{ dpart } "
891
+ basename = f"{ dirname } /.coverage{ fpart } "
892
+ os .makedirs (dirname )
893
+
894
+ covdata1 = CoverageData (basename = basename , suffix = "1" )
895
+ covdata1 .add_lines (LINES_1 )
896
+ covdata1 .write ()
897
+
898
+ covdata2 = CoverageData (basename = basename , suffix = "2" )
899
+ covdata2 .add_lines (LINES_2 )
900
+ covdata2 .write ()
901
+
902
+ covdata3 = CoverageData (basename = basename )
903
+ combine_parallel_data (covdata3 )
904
+ assert_line_counts (covdata3 , SUMMARY_1_2 )
905
+ assert_measured_files (covdata3 , MEASURED_FILES_1_2 )
906
+ self .assert_file_count (glob .escape (basename ) + ".*" , 0 )
907
+
881
908
882
909
class DumpsLoadsTest (CoverageTest ):
883
910
"""Tests of CoverageData.dumps and loads."""
You can’t perform that action at this time.
0 commit comments