Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-06-20 12:34:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix common.get_tor_paths test

Browse source
This commit is contained in:
Micah Lee 2020-04-06 21:19:17 -07:00
parent 80b1246df8
commit da12325d1d
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.circleci/config.yml
View file

@ -36,7 +36,7 @@ jobs:
name: Install dependencies name: Install dependencies
command: | command: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y python3-pip xvfb sudo apt-get install -y python3-pip xvfb tor obfs4proxy
sudo pip3 install poetry flake8 sudo pip3 install poetry flake8
poetry install poetry install

2
BUILD.md
View file

@ -32,7 +32,7 @@ cd onionshare
The recommended way to develop OnionShare is to use the latest versions of all dependencies. The recommended way to develop OnionShare is to use the latest versions of all dependencies.
First, install `tor` from either the [official Debian repository](https://support.torproject.org/apt/tor-deb-repo/), or from your package manager. First, install `tor` and `obfs4proxy` from either the [official Debian repository](https://support.torproject.org/apt/tor-deb-repo/), or from your package manager.
Then download Qt 5.14.0 for Linux: Then download Qt 5.14.0 for Linux:

16
tests/test_cli_common.py
View file

@ -227,12 +227,16 @@ class TestGetTorPaths:
# @pytest.mark.skipif(sys.platform != 'Linux', reason='requires Linux') ? # @pytest.mark.skipif(sys.platform != 'Linux', reason='requires Linux') ?
def test_get_tor_paths_linux(self, platform_linux, common_obj): def test_get_tor_paths_linux(self, platform_linux, common_obj):
assert common_obj.get_tor_paths() == ( (
"/usr/bin/tor", tor_path,
"/usr/share/tor/geoip", tor_geo_ip_file_path,
"/usr/share/tor/geoip6", tor_geo_ipv6_file_path,
"/usr/bin/obfs4proxy", _, # 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') ? # @pytest.mark.skipif(sys.platform != 'Windows', reason='requires Windows') ?
def test_get_tor_paths_windows(self, platform_windows, common_obj, sys_frozen): def test_get_tor_paths_windows(self, platform_windows, common_obj, sys_frozen):