diff options
author | Micah Lee <micah@micahflee.com> | 2020-03-22 17:20:17 -0700 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2020-03-22 17:20:17 -0700 |
commit | fc0dbd153f74e529cbdfd03325de46f2fce49a27 (patch) | |
tree | f2d655bccd91eddfc5b05473fcd37a4d0819bcfe /tests | |
parent | 097f5f604709bb75d2b4c91ec90acb4f2749a523 (diff) | |
parent | 785512218d6f38baecbd0e64784cfdeb59190c0a (diff) | |
download | onionshare-fc0dbd153f74e529cbdfd03325de46f2fce49a27.tar.gz onionshare-fc0dbd153f74e529cbdfd03325de46f2fce49a27.zip |
Merge branch 'fix_tests' into 1064_tabs
Diffstat (limited to 'tests')
-rw-r--r-- | tests/pytest.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/pytest.ini b/tests/pytest.ini new file mode 100644 index 00000000..393e0dd8 --- /dev/null +++ b/tests/pytest.ini @@ -0,0 +1,4 @@ +[pytest] +markers = + gui: marks tests as a GUI test + tor: marks tests as a Tor GUI test
\ No newline at end of file |