##// END OF EJS Templates
run-tests: stop matching line for missing feature...
marmoute -
r42705:c1850798 stable
parent child Browse files
Show More
@@ -1748,7 +1748,8 b' class TTest(Test):'
1748
1748
1749 el = m.group(1) + b"\n"
1749 el = m.group(1) + b"\n"
1750 if not self._iftest(conditions):
1750 if not self._iftest(conditions):
1751 retry = "retry" # Not required by listed features
1751 # listed feature missing, should not match
1752 return "retry", False
1752
1753
1753 if el.endswith(b" (esc)\n"):
1754 if el.endswith(b" (esc)\n"):
1754 if PYTHON3:
1755 if PYTHON3:
@@ -498,6 +498,7 b' Try merging the other direction too'
498 $ hg debugpathcopies 0 4
498 $ hg debugpathcopies 0 4
499 x -> z (filelog !)
499 x -> z (filelog !)
500 y -> z (compatibility !)
500 y -> z (compatibility !)
501 y -> z (changeset !)
501 $ hg debugpathcopies 1 5
502 $ hg debugpathcopies 1 5
502 $ hg debugpathcopies 2 5
503 $ hg debugpathcopies 2 5
503 $ hg debugpathcopies 0 5
504 $ hg debugpathcopies 0 5
@@ -84,8 +84,8 b' Test basic extension support'
84 uipopulate called (1 times)
84 uipopulate called (1 times)
85 uipopulate called (1 times) (chg !)
85 uipopulate called (1 times) (chg !)
86 uipopulate called (1 times) (chg !)
86 uipopulate called (1 times) (chg !)
87 uipopulate called (1 times) (chg !)
87 uipopulate called (1 times)
88 reposetup called for a (chg !)
88 reposetup called for a
89 ui == repo.ui
89 ui == repo.ui
90 Foo
90 Foo
91 $ hg foo --debug
91 $ hg foo --debug
@@ -96,8 +96,8 b' Test basic extension support'
96 uipopulate called (1 times)
96 uipopulate called (1 times)
97 uipopulate called (1 times) (chg !)
97 uipopulate called (1 times) (chg !)
98 uipopulate called (1 times) (chg !)
98 uipopulate called (1 times) (chg !)
99 uipopulate called (1 times) (chg !)
99 uipopulate called (1 times)
100 reposetup called for a (chg !)
100 reposetup called for a
101 ui == repo.ui
101 ui == repo.ui
102 Foo
102 Foo
103
103
@@ -107,7 +107,7 b' Test basic extension support'
107 uisetup called [status] (no-chg !)
107 uisetup called [status] (no-chg !)
108 uipopulate called (1 times)
108 uipopulate called (1 times)
109 uipopulate called (1 times) (chg !)
109 uipopulate called (1 times) (chg !)
110 uipopulate called (1 times) (chg !)
110 uipopulate called (1 times)
111 reposetup called for a
111 reposetup called for a
112 ui == repo.ui
112 ui == repo.ui
113 uipopulate called (1 times)
113 uipopulate called (1 times)
@@ -61,8 +61,10 b' Cloning a specific file when stream clon'
61 Making sure we have the correct set of requirements
61 Making sure we have the correct set of requirements
62
62
63 $ cat .hg/requires
63 $ cat .hg/requires
64 dotencode (tree flat-fncache !)
64 dotencode (tree !)
65 fncache (tree flat-fncache !)
65 dotencode (flat-fncache !)
66 fncache (tree !)
67 fncache (flat-fncache !)
66 generaldelta
68 generaldelta
67 narrowhg-experimental
69 narrowhg-experimental
68 revlogv1
70 revlogv1
@@ -75,8 +77,9 b' Making sure store has the required files'
75 $ ls .hg/store/
77 $ ls .hg/store/
76 00changelog.i
78 00changelog.i
77 00manifest.i
79 00manifest.i
78 data (tree flat-fncache !)
80 data
79 fncache (tree flat-fncache !)
81 fncache (tree !)
82 fncache (flat-fncache !)
80 meta (tree !)
83 meta (tree !)
81 narrowspec
84 narrowspec
82 undo
85 undo
@@ -124,7 +124,7 b' added upstream revisions.'
124 adding manifests
124 adding manifests
125 adding widest/ revisions (tree !)
125 adding widest/ revisions (tree !)
126 adding file changes
126 adding file changes
127 adding widest/f revisions (tree !)
127 adding widest/f revisions
128 added 0 changesets with 1 changes to 1 files
128 added 0 changesets with 1 changes to 1 files
129 bundle2-input-part: total payload size * (glob)
129 bundle2-input-part: total payload size * (glob)
130 bundle2-input-bundle: 0 parts total
130 bundle2-input-bundle: 0 parts total
@@ -1936,3 +1936,70 b' Test automatic pattern replacement'
1936 running 1 tests using 1 parallel processes
1936 running 1 tests using 1 parallel processes
1937 .
1937 .
1938 # Ran 1 tests, 0 skipped, 0 failed.
1938 # Ran 1 tests, 0 skipped, 0 failed.
1939
1940 Test conditional output matching
1941 ================================
1942
1943 $ cat << EOF >> test-conditional-matching.t
1944 > #testcases foo bar
1945 > $ echo richtig
1946 > richtig (true !)
1947 > $ echo falsch
1948 > falsch (false !)
1949 > #if foo
1950 > $ echo arthur
1951 > arthur (bar !)
1952 > #endif
1953 > $ echo celeste
1954 > celeste (foo !)
1955 > $ echo zephir
1956 > zephir (bar !)
1957 > EOF
1958
1959 $ rt test-conditional-matching.t
1960 running 2 tests using 1 parallel processes
1961
1962 --- $TESTTMP/anothertests/cases/test-conditional-matching.t
1963 +++ $TESTTMP/anothertests/cases/test-conditional-matching.t#bar.err
1964 @@ -3,11 +3,13 @@
1965 richtig (true !)
1966 $ echo falsch
1967 falsch (false !)
1968 + falsch
1969 #if foo
1970 $ echo arthur
1971 arthur \(bar !\) (re)
1972 #endif
1973 $ echo celeste
1974 celeste \(foo !\) (re)
1975 + celeste
1976 $ echo zephir
1977 zephir \(bar !\) (re)
1978
1979 ERROR: test-conditional-matching.t#bar output changed
1980 !
1981 --- $TESTTMP/anothertests/cases/test-conditional-matching.t
1982 +++ $TESTTMP/anothertests/cases/test-conditional-matching.t#foo.err
1983 @@ -3,11 +3,14 @@
1984 richtig (true !)
1985 $ echo falsch
1986 falsch (false !)
1987 + falsch
1988 #if foo
1989 $ echo arthur
1990 arthur \(bar !\) (re)
1991 + arthur
1992 #endif
1993 $ echo celeste
1994 celeste \(foo !\) (re)
1995 $ echo zephir
1996 zephir \(bar !\) (re)
1997 + zephir
1998
1999 ERROR: test-conditional-matching.t#foo output changed
2000 !
2001 Failed test-conditional-matching.t#bar: output changed
2002 Failed test-conditional-matching.t#foo: output changed
2003 # Ran 2 tests, 0 skipped, 2 failed.
2004 python hash seed: * (glob)
2005 [1]
General Comments 0
You need to be logged in to leave comments. Login now