##// END OF EJS Templates
tests: do not skip code-checking on some whole files...
Simon Heimberg -
r19381:e033a7d4 default
parent child Browse files
Show More
@@ -1,51 +1,51 b''
1 #!/usr/bin/env python
1 #!/usr/bin/env python
2
2
3 # Filter output by pyflakes to control which warnings we check
3 # Filter output by pyflakes to control which warnings we check
4
4
5 import sys, re, os
5 import sys, re, os
6
6
7 def makekey(typeandline):
7 def makekey(typeandline):
8 """
8 """
9 for sorting lines by: msgtype, path/to/file, lineno, message
9 for sorting lines by: msgtype, path/to/file, lineno, message
10
10
11 typeandline is a sequence of a message type and the entire message line
11 typeandline is a sequence of a message type and the entire message line
12 the message line format is path/to/file:line: message
12 the message line format is path/to/file:line: message
13
13
14 >>> makekey((3, 'example.py:36: any message'))
14 >>> makekey((3, 'example.py:36: any message'))
15 (3, 'example.py', 36, ' any message')
15 (3, 'example.py', 36, ' any message')
16 >>> makekey((7, 'path/to/file.py:68: dummy message'))
16 >>> makekey((7, 'path/to/file.py:68: dummy message'))
17 (7, 'path/to/file.py', 68, ' dummy message')
17 (7, 'path/to/file.py', 68, ' dummy message')
18 >>> makekey((2, 'fn:88: m')) > makekey((2, 'fn:9: m'))
18 >>> makekey((2, 'fn:88: m')) > makekey((2, 'fn:9: m'))
19 True
19 True
20 """
20 """
21
21
22 msgtype, line = typeandline
22 msgtype, line = typeandline
23 fname, line, message = line.split(":", 2)
23 fname, line, message = line.split(":", 2)
24 # line as int for ordering 9 before 88
24 # line as int for ordering 9 before 88
25 return msgtype, fname, int(line), message
25 return msgtype, fname, int(line), message
26
26
27
27
28 lines = []
28 lines = []
29 for line in sys.stdin:
29 for line in sys.stdin:
30 # We whitelist tests (see more messages in pyflakes.messages)
30 # We whitelist tests (see more messages in pyflakes.messages)
31 pats = [
31 pats = [
32 r"imported but unused",
32 r"imported but unused",
33 r"local variable '.*' is assigned to but never used",
33 r"local variable '.*' is assigned to but never used",
34 r"unable to detect undefined names",
34 r"unable to detect undefined names",
35 ]
35 ]
36 for msgtype, pat in enumerate(pats):
36 for msgtype, pat in enumerate(pats):
37 if re.search(pat, line):
37 if re.search(pat, line):
38 break # pattern matches
38 break # pattern matches
39 else:
39 else:
40 continue # no pattern matched, next line
40 continue # no pattern matched, next line
41 fn = line.split(':', 1)[0]
41 fn = line.split(':', 1)[0]
42 f = open(os.path.join(os.path.dirname(os.path.dirname(__file__)), fn))
42 f = open(os.path.join(os.path.dirname(os.path.dirname(__file__)), fn))
43 data = f.read()
43 data = f.read()
44 f.close()
44 f.close()
45 if 'no-check-code' in data:
45 if 'no-' 'check-code' in data:
46 continue
46 continue
47 lines.append((msgtype, line))
47 lines.append((msgtype, line))
48
48
49 for msgtype, line in sorted(lines, key = makekey):
49 for msgtype, line in sorted(lines, key = makekey):
50 sys.stdout.write(line)
50 sys.stdout.write(line)
51 print
51 print
@@ -1,287 +1,287 b''
1 $ remove() {
1 $ remove() {
2 > hg rm $@
2 > hg rm $@
3 > echo "exit code: $?" # no-check-code
3 > echo "exit code: $?"
4 > hg st
4 > hg st
5 > # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5
5 > # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5
6 > find . -name .hg -prune -o -type f -print | sort
6 > find . -name .hg -prune -o -type f -print | sort
7 > hg up -C
7 > hg up -C
8 > }
8 > }
9
9
10 $ hg init a
10 $ hg init a
11 $ cd a
11 $ cd a
12 $ echo a > foo
12 $ echo a > foo
13
13
14 file not managed
14 file not managed
15
15
16 $ remove foo
16 $ remove foo
17 not removing foo: file is untracked
17 not removing foo: file is untracked
18 exit code: 1
18 exit code: 1
19 ? foo
19 ? foo
20 ./foo
20 ./foo
21 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
21 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
22
22
23 $ hg add foo
23 $ hg add foo
24 $ hg commit -m1
24 $ hg commit -m1
25
25
26 the table cases
26 the table cases
27 00 state added, options none
27 00 state added, options none
28
28
29 $ echo b > bar
29 $ echo b > bar
30 $ hg add bar
30 $ hg add bar
31 $ remove bar
31 $ remove bar
32 not removing bar: file has been marked for add (use forget to undo)
32 not removing bar: file has been marked for add (use forget to undo)
33 exit code: 1
33 exit code: 1
34 A bar
34 A bar
35 ./bar
35 ./bar
36 ./foo
36 ./foo
37 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
37 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
38
38
39 01 state clean, options none
39 01 state clean, options none
40
40
41 $ remove foo
41 $ remove foo
42 exit code: 0
42 exit code: 0
43 R foo
43 R foo
44 ? bar
44 ? bar
45 ./bar
45 ./bar
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
47
47
48 02 state modified, options none
48 02 state modified, options none
49
49
50 $ echo b >> foo
50 $ echo b >> foo
51 $ remove foo
51 $ remove foo
52 not removing foo: file is modified (use -f to force removal)
52 not removing foo: file is modified (use -f to force removal)
53 exit code: 1
53 exit code: 1
54 M foo
54 M foo
55 ? bar
55 ? bar
56 ./bar
56 ./bar
57 ./foo
57 ./foo
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
59
59
60 03 state missing, options none
60 03 state missing, options none
61
61
62 $ rm foo
62 $ rm foo
63 $ remove foo
63 $ remove foo
64 exit code: 0
64 exit code: 0
65 R foo
65 R foo
66 ? bar
66 ? bar
67 ./bar
67 ./bar
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69
69
70 10 state added, options -f
70 10 state added, options -f
71
71
72 $ echo b > bar
72 $ echo b > bar
73 $ hg add bar
73 $ hg add bar
74 $ remove -f bar
74 $ remove -f bar
75 exit code: 0
75 exit code: 0
76 ? bar
76 ? bar
77 ./bar
77 ./bar
78 ./foo
78 ./foo
79 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
79 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
80 $ rm bar
80 $ rm bar
81
81
82 11 state clean, options -f
82 11 state clean, options -f
83
83
84 $ remove -f foo
84 $ remove -f foo
85 exit code: 0
85 exit code: 0
86 R foo
86 R foo
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
88
88
89 12 state modified, options -f
89 12 state modified, options -f
90
90
91 $ echo b >> foo
91 $ echo b >> foo
92 $ remove -f foo
92 $ remove -f foo
93 exit code: 0
93 exit code: 0
94 R foo
94 R foo
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
96
96
97 13 state missing, options -f
97 13 state missing, options -f
98
98
99 $ rm foo
99 $ rm foo
100 $ remove -f foo
100 $ remove -f foo
101 exit code: 0
101 exit code: 0
102 R foo
102 R foo
103 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
103 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
104
104
105 20 state added, options -A
105 20 state added, options -A
106
106
107 $ echo b > bar
107 $ echo b > bar
108 $ hg add bar
108 $ hg add bar
109 $ remove -A bar
109 $ remove -A bar
110 not removing bar: file still exists
110 not removing bar: file still exists
111 exit code: 1
111 exit code: 1
112 A bar
112 A bar
113 ./bar
113 ./bar
114 ./foo
114 ./foo
115 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
115 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
116
116
117 21 state clean, options -A
117 21 state clean, options -A
118
118
119 $ remove -A foo
119 $ remove -A foo
120 not removing foo: file still exists
120 not removing foo: file still exists
121 exit code: 1
121 exit code: 1
122 ? bar
122 ? bar
123 ./bar
123 ./bar
124 ./foo
124 ./foo
125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
125 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
126
126
127 22 state modified, options -A
127 22 state modified, options -A
128
128
129 $ echo b >> foo
129 $ echo b >> foo
130 $ remove -A foo
130 $ remove -A foo
131 not removing foo: file still exists
131 not removing foo: file still exists
132 exit code: 1
132 exit code: 1
133 M foo
133 M foo
134 ? bar
134 ? bar
135 ./bar
135 ./bar
136 ./foo
136 ./foo
137 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
137 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
138
138
139 23 state missing, options -A
139 23 state missing, options -A
140
140
141 $ rm foo
141 $ rm foo
142 $ remove -A foo
142 $ remove -A foo
143 exit code: 0
143 exit code: 0
144 R foo
144 R foo
145 ? bar
145 ? bar
146 ./bar
146 ./bar
147 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
147 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
148
148
149 30 state added, options -Af
149 30 state added, options -Af
150
150
151 $ echo b > bar
151 $ echo b > bar
152 $ hg add bar
152 $ hg add bar
153 $ remove -Af bar
153 $ remove -Af bar
154 exit code: 0
154 exit code: 0
155 ? bar
155 ? bar
156 ./bar
156 ./bar
157 ./foo
157 ./foo
158 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
158 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
159 $ rm bar
159 $ rm bar
160
160
161 31 state clean, options -Af
161 31 state clean, options -Af
162
162
163 $ remove -Af foo
163 $ remove -Af foo
164 exit code: 0
164 exit code: 0
165 R foo
165 R foo
166 ./foo
166 ./foo
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
168
168
169 32 state modified, options -Af
169 32 state modified, options -Af
170
170
171 $ echo b >> foo
171 $ echo b >> foo
172 $ remove -Af foo
172 $ remove -Af foo
173 exit code: 0
173 exit code: 0
174 R foo
174 R foo
175 ./foo
175 ./foo
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
177
177
178 33 state missing, options -Af
178 33 state missing, options -Af
179
179
180 $ rm foo
180 $ rm foo
181 $ remove -Af foo
181 $ remove -Af foo
182 exit code: 0
182 exit code: 0
183 R foo
183 R foo
184 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
184 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
185
185
186 test some directory stuff
186 test some directory stuff
187
187
188 $ mkdir test
188 $ mkdir test
189 $ echo a > test/foo
189 $ echo a > test/foo
190 $ echo b > test/bar
190 $ echo b > test/bar
191 $ hg ci -Am2
191 $ hg ci -Am2
192 adding test/bar
192 adding test/bar
193 adding test/foo
193 adding test/foo
194
194
195 dir, options none
195 dir, options none
196
196
197 $ rm test/bar
197 $ rm test/bar
198 $ remove test
198 $ remove test
199 removing test/bar (glob)
199 removing test/bar (glob)
200 removing test/foo (glob)
200 removing test/foo (glob)
201 exit code: 0
201 exit code: 0
202 R test/bar
202 R test/bar
203 R test/foo
203 R test/foo
204 ./foo
204 ./foo
205 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
205 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
206
206
207 dir, options -f
207 dir, options -f
208
208
209 $ rm test/bar
209 $ rm test/bar
210 $ remove -f test
210 $ remove -f test
211 removing test/bar (glob)
211 removing test/bar (glob)
212 removing test/foo (glob)
212 removing test/foo (glob)
213 exit code: 0
213 exit code: 0
214 R test/bar
214 R test/bar
215 R test/foo
215 R test/foo
216 ./foo
216 ./foo
217 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
217 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
218
218
219 dir, options -A
219 dir, options -A
220
220
221 $ rm test/bar
221 $ rm test/bar
222 $ remove -A test
222 $ remove -A test
223 not removing test/foo: file still exists (glob)
223 not removing test/foo: file still exists (glob)
224 removing test/bar (glob)
224 removing test/bar (glob)
225 exit code: 1
225 exit code: 1
226 R test/bar
226 R test/bar
227 ./foo
227 ./foo
228 ./test/foo
228 ./test/foo
229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
230
230
231 dir, options -Af
231 dir, options -Af
232
232
233 $ rm test/bar
233 $ rm test/bar
234 $ remove -Af test
234 $ remove -Af test
235 removing test/bar (glob)
235 removing test/bar (glob)
236 removing test/foo (glob)
236 removing test/foo (glob)
237 exit code: 0
237 exit code: 0
238 R test/bar
238 R test/bar
239 R test/foo
239 R test/foo
240 ./foo
240 ./foo
241 ./test/foo
241 ./test/foo
242 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
242 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
243
243
244 test remove dropping empty trees (issue1861)
244 test remove dropping empty trees (issue1861)
245
245
246 $ mkdir -p issue1861/b/c
246 $ mkdir -p issue1861/b/c
247 $ echo x > issue1861/x
247 $ echo x > issue1861/x
248 $ echo y > issue1861/b/c/y
248 $ echo y > issue1861/b/c/y
249 $ hg ci -Am add
249 $ hg ci -Am add
250 adding issue1861/b/c/y
250 adding issue1861/b/c/y
251 adding issue1861/x
251 adding issue1861/x
252 $ hg rm issue1861/b
252 $ hg rm issue1861/b
253 removing issue1861/b/c/y (glob)
253 removing issue1861/b/c/y (glob)
254 $ hg ci -m remove
254 $ hg ci -m remove
255 $ ls issue1861
255 $ ls issue1861
256 x
256 x
257
257
258 test that commit does not crash if the user removes a newly added file
258 test that commit does not crash if the user removes a newly added file
259
259
260 $ touch f1
260 $ touch f1
261 $ hg add f1
261 $ hg add f1
262 $ rm f1
262 $ rm f1
263 $ hg ci -A -mx
263 $ hg ci -A -mx
264 removing f1
264 removing f1
265 nothing changed
265 nothing changed
266 [1]
266 [1]
267
267
268 handling of untracked directories and missing files
268 handling of untracked directories and missing files
269
269
270 $ mkdir d1
270 $ mkdir d1
271 $ echo a > d1/a
271 $ echo a > d1/a
272 $ hg rm --after d1
272 $ hg rm --after d1
273 not removing d1: no tracked files
273 not removing d1: no tracked files
274 [1]
274 [1]
275 $ hg add d1/a
275 $ hg add d1/a
276 $ rm d1/a
276 $ rm d1/a
277 $ hg rm --after d1
277 $ hg rm --after d1
278 removing d1/a (glob)
278 removing d1/a (glob)
279 #if windows
279 #if windows
280 $ hg rm --after nosuch
280 $ hg rm --after nosuch
281 nosuch: * (glob)
281 nosuch: * (glob)
282 [1]
282 [1]
283 #else
283 #else
284 $ hg rm --after nosuch
284 $ hg rm --after nosuch
285 nosuch: No such file or directory
285 nosuch: No such file or directory
286 [1]
286 [1]
287 #endif
287 #endif
General Comments 0
You need to be logged in to leave comments. Login now