Show More
@@ -1451,10 +1451,7 b' class TTest(Test):' | |||||
1451 |
|
1451 | |||
1452 | r = self.linematch(el, lout) |
|
1452 | r = self.linematch(el, lout) | |
1453 | if isinstance(r, str): |
|
1453 | if isinstance(r, str): | |
1454 |
if r == ' |
|
1454 | if r == '-glob': | |
1455 | lout = el[:-1] + ' (glob)\n' |
|
|||
1456 | r = '' # Warn only this line. |
|
|||
1457 | elif r == '-glob': |
|
|||
1458 | lout = ''.join(el.rsplit(' (glob)', 1)) |
|
1455 | lout = ''.join(el.rsplit(' (glob)', 1)) | |
1459 | r = '' # Warn only this line. |
|
1456 | r = '' # Warn only this line. | |
1460 | elif r == "retry": |
|
1457 | elif r == "retry": | |
@@ -1613,7 +1610,7 b' class TTest(Test):' | |||||
1613 | if os.altsep: |
|
1610 | if os.altsep: | |
1614 | _l = l.replace(b'\\', b'/') |
|
1611 | _l = l.replace(b'\\', b'/') | |
1615 | if el == _l or os.name == 'nt' and el[:-1] + b'\r\n' == _l: |
|
1612 | if el == _l or os.name == 'nt' and el[:-1] + b'\r\n' == _l: | |
1616 |
return |
|
1613 | return True | |
1617 | return retry |
|
1614 | return retry | |
1618 |
|
1615 | |||
1619 | @staticmethod |
|
1616 | @staticmethod |
@@ -67,9 +67,9 b' def wintests():' | |||||
67 |
|
67 | |||
68 | missing glob |
|
68 | missing glob | |
69 | >>> lm(b'/g/c/d/fg\n', b'\\g\\c\\d/fg\n') |
|
69 | >>> lm(b'/g/c/d/fg\n', b'\\g\\c\\d/fg\n') | |
70 | 'special: +glob' |
|
70 | True | |
71 | >>> lm(b'/g/c/d/fg\n', b'\\g\\c\\d\\fg\r\n') |
|
71 | >>> lm(b'/g/c/d/fg\n', b'\\g\\c\\d\\fg\r\n') | |
72 | 'special: +glob' |
|
72 | True | |
73 |
|
73 | |||
74 | restore os.altsep |
|
74 | restore os.altsep | |
75 | >>> os.altsep = _osaltsep |
|
75 | >>> os.altsep = _osaltsep |
General Comments 0
You need to be logged in to leave comments.
Login now