X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=blobdiff_plain;f=HACKING;h=31f48a556336b133af5cfc46fa2ed0526ec97336;hp=c7845730798762e99d82e33ee91ad288e0b63bef;hb=0144a07edc1a00b065bda208c36986b8201fb15a;hpb=fe6ea219ba2f8f9ce18e0399581ff7f4602a8760

diff --git a/HACKING b/HACKING
index c784573..31f48a5 100644
--- a/HACKING
+++ b/HACKING
@@ -60,26 +60,24 @@ We also love a good "Tested-by:" -- the more the merrier.
 Testing
 =======
 
-You can run the test suite much more quickly via "make -j test" (as
-compared to "make test"), at the expense of slightly more confusing
-output (interleaved parallel test output), and inaccurate intermediate
-success/failure counts, but the final counts displayed should be
-correct.
+Individual tests can be run via
 
-Individual non-Python tests can be run via
+    ./pytest TEST
 
-    ./wvtest run test/ext/TEST
+For example:
 
-and if you'd like to see all of the test output, you can omit the
-wvtest run wrapper: `test/ext/TEST`.  Individual Python tests can be
-run via
-
-    ./pytest test/int/test_something.py
+    ./pytest test/int/test_git.py
+    ./pytest test/ext/test-ftp
 
 Internal tests that test bup's code directly are located in test/int,
 and external tests that test bup from the outside, typically by
 running the executable, are located in test/ext.
 
+Currently, all pytests must be located in either test/ext or test/int.
+Internal test filenames must match test_*.py, and external tests must
+be located in text/ext and their filenames must match test-* (see
+test/ext/conftest.py for the handling of the latter).  Any paths
+matching those criteria will be automatically collected by pytest.
 
 Some aspects of the environment are automatically restored after each
 test via fixtures in conftest.py, including the state of the