summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2020-08-20 22:37:25 -0700
committerMicah Lee <micah@micahflee.com>2020-08-20 22:37:25 -0700
commit9e9dfb86e39462a49922baf55f95d714dd0bc7c2 (patch)
treef9b99baeeddab5ac2499d65987df24d0f4599c01 /tests
parente68266fe63a731f775d5a22368b52667bafb332e (diff)
downloadonionshare-9e9dfb86e39462a49922baf55f95d714dd0bc7c2.tar.gz
onionshare-9e9dfb86e39462a49922baf55f95d714dd0bc7c2.zip
Allow tor files to be in /usr/share or /usr/local/share in tests
Diffstat (limited to 'tests')
-rw-r--r--tests/test_cli_common.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/test_cli_common.py b/tests/test_cli_common.py
index 3592d1ba..eb3ece04 100644
--- a/tests/test_cli_common.py
+++ b/tests/test_cli_common.py
@@ -235,8 +235,14 @@ class TestGetTorPaths:
) = 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"
+ assert (
+ tor_geo_ip_file_path == "/usr/share/tor/geoip"
+ or tor_geo_ip_file_path == "/usr/local/share/tor/geoip"
+ )
+ assert (
+ tor_geo_ipv6_file_path == "/usr/share/tor/geoip6"
+ or tor_geo_ipv6_file_path == "/usr/local/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):