Merge branch 'develop' into v3-revisited

1 files changed, 7 insertions, 15 deletions

diff --git a/BUILD.md b/BUILD.md
index d8150799..7663ec23 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -149,30 +149,22 @@ OnionShare includes PyTest unit tests. To run the tests, first install some depe
 pip3 install -r install/requirements-tests.txt
 ```
 
-You must have `pytest` in your path point to python 3's pytest. If necessary, you might need to make a symlink, like:
-
-```sh
-ln -s /usr/bin/pytest-3 /usr/local/bin/pytest
-```
-
-If you'd like to run the CLI-based tests that Travis runs:
+Then you can run `pytest` against the `tests/` directory.
 
 ```sh
 pytest tests/
 ```
 
-If you would like to run the GUI unit tests in 'local only mode':
+If you would like to also run the GUI unit tests in 'tor' mode, start Tor Browser in the background, then run:
 
 ```sh
-cd tests_gui_local/
-./run_unit_tests.sh
+pytest --runtor tests/
 ```
 
-If you would like to run the GUI unit tests in 'tor' (bundled) mode:
+Keep in mind that the Tor tests take a lot longer to run than local mode, but they are also more comprehensive.
+
+You can also choose to wrap the tests in `xvfb-run` so that a ton of OnionShare windows don't pop up on your desktop (you may need to install the `xorg-x11-server-Xvfb` package), like this:
 
 ```sh
-cd tests_gui_tor/
-./run_unit_tests.sh
+xvfb-run pytest tests/
 ```
-
-Keep in mind that the Tor tests take a lot longer to run than local mode, but they are also more comprehensive.