# HG changeset patch # User Matt Mackall # Date 1407343988 18000 # Node ID 8fb6844a4ff1be8152ed700fab069140b522b079 # Parent 7a9cbb315d8464b097c5a557d6482f7b261a4755 tests: change some #ifs to #requires diff -r 7a9cbb315d84 -r 8fb6844a4ff1 tests/test-check-code-hg.t --- a/tests/test-check-code-hg.t Wed Aug 06 11:43:59 2014 -0500 +++ b/tests/test-check-code-hg.t Wed Aug 06 11:53:08 2014 -0500 @@ -1,4 +1,4 @@ -#if test-repo +#require test-repo $ check_code="$TESTDIR"/../contrib/check-code.py $ cd "$TESTDIR"/.. @@ -13,5 +13,3 @@ Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob) Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob) Skipping mercurial/httpclient/socketutil.py it has no-che?k-code (glob) - -#endif diff -r 7a9cbb315d84 -r 8fb6844a4ff1 tests/test-check-pyflakes.t --- a/tests/test-check-pyflakes.t Wed Aug 06 11:43:59 2014 -0500 +++ b/tests/test-check-pyflakes.t Wed Aug 06 11:53:08 2014 -0500 @@ -1,4 +1,4 @@ -#if test-repo pyflakes +#require test-repo pyflakes $ cd "`dirname "$TESTDIR"`" @@ -18,5 +18,3 @@ tests/hghave.py:*: 'ssl' imported but unused (glob) contrib/win32/hgwebdir_wsgi.py:93: 'from isapi.install import *' used; unable to detect undefined names (glob) tests/filterpyflakes.py:58: undefined name 'undefinedname' - -#endif diff -r 7a9cbb315d84 -r 8fb6844a4ff1 tests/test-lock-badness.t --- a/tests/test-lock-badness.t Wed Aug 06 11:43:59 2014 -0500 +++ b/tests/test-lock-badness.t Wed Aug 06 11:53:08 2014 -0500 @@ -1,4 +1,4 @@ -#if unix-permissions no-root no-windows +#require unix-permissions no-root no-windows Prepare @@ -39,4 +39,3 @@ [255] $ chmod 700 a/.hg/store -#endif diff -r 7a9cbb315d84 -r 8fb6844a4ff1 tests/test-permissions.t --- a/tests/test-permissions.t Wed Aug 06 11:43:59 2014 -0500 +++ b/tests/test-permissions.t Wed Aug 06 11:53:08 2014 -0500 @@ -1,4 +1,4 @@ -#if unix-permissions no-root +#require unix-permissions no-root $ hg init t $ cd t @@ -70,5 +70,3 @@ $ chmod +rx dir $ cd .. - -#endif diff -r 7a9cbb315d84 -r 8fb6844a4ff1 tests/test-pull-permission.t --- a/tests/test-pull-permission.t Wed Aug 06 11:43:59 2014 -0500 +++ b/tests/test-pull-permission.t Wed Aug 06 11:53:08 2014 -0500 @@ -1,4 +1,4 @@ -#if unix-permissions no-root +#require unix-permissions no-root $ hg init a $ cd a @@ -30,5 +30,3 @@ 1 files, 1 changesets, 1 total revisions $ cd .. - -#endif diff -r 7a9cbb315d84 -r 8fb6844a4ff1 tests/test-repair-strip.t --- a/tests/test-repair-strip.t Wed Aug 06 11:43:59 2014 -0500 +++ b/tests/test-repair-strip.t Wed Aug 06 11:53:08 2014 -0500 @@ -1,4 +1,4 @@ -#if unix-permissions no-root +#require unix-permissions no-root $ echo "[extensions]" >> $HGRCPATH $ echo "mq=">> $HGRCPATH @@ -130,5 +130,3 @@ 2 files, 2 changesets, 2 total revisions $ cd .. - -#endif