Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-12 15:59:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Install new dependencies so CircleCI tests run, and fix a pytest warning

Browse Source
This commit is contained in:
Micah Lee 2020-11-01 11:50:11 -08:00
parent 790fe245e3
commit a801f0a628
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.circleci/config.yml
View File

@ -49,17 +49,18 @@ jobs:
name: Install dependencies name: Install dependencies
command: | command: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y xvfb tor obfs4proxy gcc python3-dev sudo apt-get install -y tor obfs4proxy gcc python3-dev python3-pyside2.qtcore python3-pyside2.qtwidgets python3-pyside2.qtgui
sudo apt-get install -y xvfb x11-utils libxkbcommon-x11-0 libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-render-util0 libxcb-icccm4 libxcb-keysyms1 libxcb-image0
cd ~/repo/cli cd ~/repo/cli
poetry install poetry install
poetry build poetry build
cp dist/onionshare_cli-*.whl ~/repo/desktop cp dist/onionshare_cli-*.whl ~/repo/desktop
cd ~/repo/desktop cd ~/repo/desktop
pip install briefcase pytest pytest-briefcase pytest-faulthandler pytest-qt pip install briefcase pytest pytest-briefcase pytest-faulthandler pytest-qt pytest-xvfb
pip install $(python -c 'import toml; print(" ".join(toml.loads(open("pyproject.toml").read())["tool"]["briefcase"]["app"]["onionshare"]["requires"]))') pip install $(python -c 'import toml; print(" ".join(toml.loads(open("pyproject.toml").read())["tool"]["briefcase"]["app"]["onionshare"]["requires"]))')
- run: - run:
name: Run tests name: Run tests
command: | command: |
cd ~/repo/desktop cd ~/repo/desktop
xvfb-run ./tests/run.sh ./tests/run.sh

2
cli/onionshare_cli/mode_settings.py
View File

@ -102,7 +102,7 @@ class ModeSettings:
elif self.common.platform == "Windows": elif self.common.platform == "Windows":
# On Windows, os.path.expanduser() needs to use backslash, or else it # On Windows, os.path.expanduser() needs to use backslash, or else it
# retains the forward slash, which breaks opening the folder in explorer. # retains the forward slash, which breaks opening the folder in explorer.
return os.path.expanduser("~\OnionShare") return os.path.expanduser("~\\OnionShare")
else: else:
# All other OSes # All other OSes
return os.path.expanduser("~/OnionShare") return os.path.expanduser("~/OnionShare")

9
desktop/src/onionshare/settings_dialog.py
View File

@ -665,9 +665,14 @@ class SettingsDialog(QtWidgets.QDialog):
else: else:
tor_status_update_func = None tor_status_update_func = None
onion = Onion(self.common, use_tmp_dir=True, get_tor_paths=self.common.gui.get_tor_paths) onion = Onion(
self.common,
use_tmp_dir=True,
get_tor_paths=self.common.gui.get_tor_paths,
)
onion.connect( onion.connect(
custom_settings=settings, tor_status_update_func=tor_status_update_func, custom_settings=settings,
tor_status_update_func=tor_status_update_func,
) )
# If an exception hasn't been raised yet, the Tor settings work # If an exception hasn't been raised yet, the Tor settings work