Commit 9c22eeb
committed
pytest_plugin(fix[skip_if_svn_missing]): Require svnadmin too
why: The svn fixtures build repositories with `svnadmin`, and
_skip_if_svn_missing() treats svn as available only when both the svn
client and svnadmin are present. The public skip_if_svn_missing mark and
the pytest_ignore_collect hook checked the svn client alone, so on a
host with svn but not svnadmin they disagreed with the fixtures: a
mark-decorated test would run, and svn doctest modules would be
collected while their create_svn_remote_repo namespace helper -- which
also requires svnadmin -- was withheld, erroring with NameError instead
of skipping. Make every svn-availability check require svnadmin.
what:
- Add the svnadmin check to the skip_if_svn_missing mark condition
- Require svnadmin in pytest_ignore_collect so svn modules are ignored
(not collected) when only the svn client is present1 parent c83eb53 commit 9c22eeb
1 file changed
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | | - | |
| 37 | + | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
| 55 | + | |
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | | - | |
| 124 | + | |
125 | 125 | | |
126 | 126 | | |
127 | 127 | | |
| |||
0 commit comments