##// END OF EJS Templates
run-tests: restrict the test cases allowed characters...
Boris Feld -
r38309:b5651ae5 @38 default
parent child Browse files
Show More
@@ -120,7 +120,7 b' if pygmentspresent:'
120 }
120 }
121
121
122 class TestRunnerLexer(lexer.RegexLexer):
122 class TestRunnerLexer(lexer.RegexLexer):
123 testpattern = r'[\w-]+\.(t|py)(#[^\s]+)?'
123 testpattern = r'[\w-]+\.(t|py)(#[a-zA-Z0-9_\-\.]+)?'
124 tokens = {
124 tokens = {
125 'root': [
125 'root': [
126 (r'^Skipped', token.Generic.Skipped, 'skipped'),
126 (r'^Skipped', token.Generic.Skipped, 'skipped'),
@@ -2646,7 +2646,7 b' class TestRunner(object):'
2646 expanded_args.append(arg)
2646 expanded_args.append(arg)
2647 args = expanded_args
2647 args = expanded_args
2648
2648
2649 testcasepattern = re.compile(br'([\w-]+\.t|py)(#([^\s]+))')
2649 testcasepattern = re.compile(br'([\w-]+\.t|py)(#([a-zA-Z0-9_\-\.]+))')
2650 tests = []
2650 tests = []
2651 for t in args:
2651 for t in args:
2652 case = None
2652 case = None
@@ -1643,13 +1643,13 b' Support ignoring invalid test cases'
1643 Support running complex test cases names
1643 Support running complex test cases names
1644
1644
1645 $ cat > test-cases-advanced-cases.t <<'EOF'
1645 $ cat > test-cases-advanced-cases.t <<'EOF'
1646 > #testcases simple case-with-dashes casewith!@#$%^&*()chars
1646 > #testcases simple case-with-dashes casewith_-.chars
1647 > $ echo $TESTCASE
1647 > $ echo $TESTCASE
1648 > simple
1648 > simple
1649 > EOF
1649 > EOF
1650
1650
1651 $ cat test-cases-advanced-cases.t
1651 $ cat test-cases-advanced-cases.t
1652 #testcases simple case-with-dashes casewith!@#$%^&*()chars
1652 #testcases simple case-with-dashes casewith_-.chars
1653 $ echo $TESTCASE
1653 $ echo $TESTCASE
1654 simple
1654 simple
1655
1655
@@ -1658,7 +1658,7 b' Support running complex test cases names'
1658 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
1658 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
1659 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.case-with-dashes.err
1659 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.case-with-dashes.err
1660 @@ -1,3 +1,3 @@
1660 @@ -1,3 +1,3 @@
1661 #testcases simple case-with-dashes casewith!@#$%^&*()chars
1661 #testcases simple case-with-dashes casewith_-.chars
1662 $ echo $TESTCASE
1662 $ echo $TESTCASE
1663 - simple
1663 - simple
1664 + case-with-dashes
1664 + case-with-dashes
@@ -1666,17 +1666,17 b' Support running complex test cases names'
1666 ERROR: test-cases-advanced-cases.t#case-with-dashes output changed
1666 ERROR: test-cases-advanced-cases.t#case-with-dashes output changed
1667 !
1667 !
1668 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
1668 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
1669 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.casewith!@#$%^&*()chars.err
1669 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.casewith_-.chars.err
1670 @@ -1,3 +1,3 @@
1670 @@ -1,3 +1,3 @@
1671 #testcases simple case-with-dashes casewith!@#$%^&*()chars
1671 #testcases simple case-with-dashes casewith_-.chars
1672 $ echo $TESTCASE
1672 $ echo $TESTCASE
1673 - simple
1673 - simple
1674 + casewith!@#$%^&*()chars
1674 + casewith_-.chars
1675
1675
1676 ERROR: test-cases-advanced-cases.t#casewith!@#$%^&*()chars output changed
1676 ERROR: test-cases-advanced-cases.t#casewith_-.chars output changed
1677 !.
1677 !.
1678 Failed test-cases-advanced-cases.t#case-with-dashes: output changed
1678 Failed test-cases-advanced-cases.t#case-with-dashes: output changed
1679 Failed test-cases-advanced-cases.t#casewith!@#$%^&*()chars: output changed
1679 Failed test-cases-advanced-cases.t#casewith_-.chars: output changed
1680 # Ran 3 tests, 0 skipped, 2 failed.
1680 # Ran 3 tests, 0 skipped, 2 failed.
1681 python hash seed: * (glob)
1681 python hash seed: * (glob)
1682 [1]
1682 [1]
@@ -1686,7 +1686,7 b' Support running complex test cases names'
1686 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
1686 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
1687 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.case-with-dashes.err
1687 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.case-with-dashes.err
1688 @@ -1,3 +1,3 @@
1688 @@ -1,3 +1,3 @@
1689 #testcases simple case-with-dashes casewith!@#$%^&*()chars
1689 #testcases simple case-with-dashes casewith_-.chars
1690 $ echo $TESTCASE
1690 $ echo $TESTCASE
1691 - simple
1691 - simple
1692 + case-with-dashes
1692 + case-with-dashes
@@ -1698,19 +1698,19 b' Support running complex test cases names'
1698 python hash seed: * (glob)
1698 python hash seed: * (glob)
1699 [1]
1699 [1]
1700
1700
1701 $ rt "test-cases-advanced-cases.t#casewith!@#$%^&*()chars"
1701 $ rt "test-cases-advanced-cases.t#casewith_-.chars"
1702
1702
1703 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
1703 --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
1704 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.casewith!@#$%^&*()chars.err
1704 +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.casewith_-.chars.err
1705 @@ -1,3 +1,3 @@
1705 @@ -1,3 +1,3 @@
1706 #testcases simple case-with-dashes casewith!@#$%^&*()chars
1706 #testcases simple case-with-dashes casewith_-.chars
1707 $ echo $TESTCASE
1707 $ echo $TESTCASE
1708 - simple
1708 - simple
1709 + casewith!@#$%^&*()chars
1709 + casewith_-.chars
1710
1710
1711 ERROR: test-cases-advanced-cases.t#casewith!@#$%^&*()chars output changed
1711 ERROR: test-cases-advanced-cases.t#casewith_-.chars output changed
1712 !
1712 !
1713 Failed test-cases-advanced-cases.t#casewith!@#$%^&*()chars: output changed
1713 Failed test-cases-advanced-cases.t#casewith_-.chars: output changed
1714 # Ran 1 tests, 0 skipped, 1 failed.
1714 # Ran 1 tests, 0 skipped, 1 failed.
1715 python hash seed: * (glob)
1715 python hash seed: * (glob)
1716 [1]
1716 [1]
General Comments 0
You need to be logged in to leave comments. Login now