summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2020-07-05 21:54:29 -0700
committerGitHub <noreply@github.com>2020-07-05 21:54:29 -0700
commit0b4821c905ecfefdf438e4c98e5e79592b390ced (patch)
treee36ff23c5e3f129651d3904bfacc17d21082dcc7 /tests
parent0e16d3b69e8d6f0ee4b10291a49b67ff347e7dd7 (diff)
parent7ce0f18f360f8543af0e4723c65d9175977935d8 (diff)
downloadonionshare-0b4821c905ecfefdf438e4c98e5e79592b390ced.tar.gz
onionshare-0b4821c905ecfefdf438e4c98e5e79592b390ced.zip
Merge pull request #1139 from micahflee/910_flatpak
Flatpak support
Diffstat (limited to 'tests')
-rw-r--r--tests/test_cli_common.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/test_cli_common.py b/tests/test_cli_common.py
index 1f230295..3592d1ba 100644
--- a/tests/test_cli_common.py
+++ b/tests/test_cli_common.py
@@ -227,12 +227,16 @@ class TestGetTorPaths:
# @pytest.mark.skipif(sys.platform != 'Linux', reason='requires Linux') ?
def test_get_tor_paths_linux(self, platform_linux, common_obj):
- assert common_obj.get_tor_paths() == (
- "/usr/bin/tor",
- "/usr/share/tor/geoip",
- "/usr/share/tor/geoip6",
- "/usr/bin/obfs4proxy",
- )
+ (
+ tor_path,
+ tor_geo_ip_file_path,
+ tor_geo_ipv6_file_path,
+ _, # obfs4proxy is optional
+ ) = common_obj.get_tor_paths()
+
+ assert os.path.basename(tor_path) == "tor"
+ assert tor_geo_ip_file_path == "/usr/share/tor/geoip"
+ assert tor_geo_ipv6_file_path == "/usr/share/tor/geoip6"
# @pytest.mark.skipif(sys.platform != 'Windows', reason='requires Windows') ?
def test_get_tor_paths_windows(self, platform_windows, common_obj, sys_frozen):