1023 Commits

Author SHA1 Message Date
Micah Lee
94387c6986 Merge branch 'mig5-442_use_looseversion' 2017-11-30 17:58:39 -08:00
Micah Lee
d5d8d2495a Merge branch '442_use_looseversion' of https://github.com/mig5/onionshare into mig5-442_use_looseversion 2017-11-30 17:58:25 -08:00
Micah Lee
4c3dcf50ea Merge branch 'fixes' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-fixes 2017-11-30 17:54:24 -08:00
Micah Lee
9b1dd9430d Merge branch 'kushaldas-rpmlint' 2017-11-30 15:49:56 -08:00
Kushal Das
2a3e7b3b14 Mentions python2 as the interpreter 2017-11-28 04:09:33 +05:30
Micah Lee
f56df5be46 Allow tests to find share folders when building .deb 2017-11-20 16:19:04 -08:00
Micah Lee
fac6debe32 Rename test files to have test_ prefix 2017-11-20 15:52:33 -08:00
Miguel Jacq
263d0a102b use LooseVersion instead of StrictVersion, so that upstream versions of Flask that contain -dev will still work. Fixes #442 2017-11-06 09:16:55 +11:00
Delirious Lettuce
ca4f10d35c Delete temporary tor data directory during cleanup 2017-07-13 18:14:49 -06:00
Delirious Lettuce
5aedac5143 Reorder imports, spacing, use tempfile.gettempdir 2017-07-10 20:40:01 -06:00
Delirious Lettuce
5fd3973983 Reorder imports, use json.load(f) 2017-07-10 20:13:30 -06:00
Delirious Lettuce
b59a442bf1 Reorder imports, remove p, use ext, use json.load(f) 2017-07-10 20:11:04 -06:00
Delirious Lettuce
edf1d62737 Remove: unused import, round, formatting indexes. Use tuple 2017-07-10 20:00:19 -06:00
Micah Lee
6cd4b4391d Merge branch 'mig5-440_settings_menu_button_disable' 2017-07-09 14:19:08 -07:00
Micah Lee
3333c81c77 Merge branch 'mig5-438_settings_icon_inactive' 2017-07-09 14:16:29 -07:00
Micah Lee
57a01a4f8a Merge branch 'mig5-custom_config' 2017-07-09 14:12:49 -07:00
Micah Lee
dd3bbe9996 Merge branch 'mig5-433_reset_downloads_on_fresh_share' 2017-07-09 13:19:26 -07:00
Micah Lee
df4e34d6ce Merge branch 'mig5-428_fix_order' 2017-07-09 13:11:35 -07:00
Micah Lee
ca87bb020e Merge branch 'delirious-lettuce-test_onionshare_common' 2017-07-09 10:59:00 -07:00
Micah Lee
5df96ad768 Remove references to nosetests, and replace them with pytest 2017-07-09 10:55:16 -07:00
Micah Lee
93caf2fc73 Merge branch '433_reset_downloads_on_fresh_share' of https://github.com/mig5/onionshare into mig5-433_reset_downloads_on_fresh_share 2017-07-09 10:11:00 -07:00
Micah Lee
178b6022b6 Merge branch '428_fix_order' of https://github.com/mig5/onionshare into mig5-428_fix_order 2017-07-09 10:10:12 -07:00
Delirious Lettuce
f7556102b1 Remove unnecessary imports, add tests 2017-07-08 11:31:25 -06:00
Delirious Lettuce
8a70c60632 Modify import (more direct), remove unnecessary parentheses 2017-07-08 11:30:26 -06:00
Delirious Lettuce
d837652cd9 fixture instead of yield_fixture (2), remove parentheses 2017-07-08 11:29:19 -06:00
Delirious Lettuce
22906249e7 Initial commit, coverage of onionshare.settings.py at 92% 2017-07-08 11:23:17 -06:00
Delirious Lettuce
da1e744150 Add locale fixtures 2017-07-08 00:17:20 -06:00
Delirious Lettuce
880ed56054 Merge remote-tracking branch 'origin/test_onionshare_common' into test_onionshare_common
# Conflicts:
#	test/onionshare_common_test.py
2017-07-07 23:21:21 -06:00
Delirious Lettuce
19b41cc3b6 Create temporary file/directory without deleting them after 2017-07-07 23:16:37 -06:00
Delirious Lettuce
d5792bd357 Add cleanup tests 2017-07-07 23:14:47 -06:00
Delirious Lettuce
1fa5d3a2a6 Initial commit (all current pytest fixtures) 2017-07-07 22:51:09 -06:00
Delirious Lettuce
bdf9765234 Move fixtures to conftest, remove unneeded imports, spacing 2017-07-07 22:50:11 -06:00
Delirious Lettuce
7724df923f * Use re.verbose on LOG_MSG_REGEX
* Create new fixtures for creating temporary files and directories
* Modify custom_zw fixture to include custom callback function to test
* Delete parent directory of ZipWriter file from default_zw fixture
* Modify monkeypatch arguments
* Group tests into separate classes for each function
* Parametrize ZeroDivisionError tests
* Test all regular expressions
* Use new fixtures to ensure proper deletion of files after testing
2017-07-07 21:33:45 -06:00
Delirious Lettuce
6558d2f7ce Add conftest.py file 2017-07-07 14:26:19 -06:00
Delirious Lettuce
8456591424 initial commit of onionshare_test.py mods 2017-07-05 14:44:27 -06:00
Delirious Lettuce
03a4df4980 WIP: up to 100% test coverage of common.py 2017-07-04 23:17:51 -06:00
Delirious Lettuce
7a52ec3781 Uncomment after_success 2017-07-04 12:24:38 -06:00
Delirious Lettuce
597502f6e7 Modify .travis.yml 2017-07-04 12:24:38 -06:00
Delirious Lettuce
b247d589d1 Remove test (ZipInfo.is_dir() is Python 3.6+ only) 2017-07-04 12:24:38 -06:00
Delirious Lettuce
1b7160e1d6 Comment out sudo: required 2017-07-04 12:24:38 -06:00
Delirious Lettuce
97a48a76e3 Initial commit of previous changes, add coverage to travis 2017-07-04 12:24:38 -06:00
Miguel Jacq
5d57eb5893 Need to actually ensure the dark settings icon is set back once server inactive again 2017-06-03 19:04:21 +10:00
Miguel Jacq
6b0d66b90d fix the settings icon so it only switches to inactive icon when server is active 2017-06-03 19:01:40 +10:00
Miguel Jacq
f8ecac2903 #440 disable the Settings menu action when server is active 2017-06-03 18:55:09 +10:00
Miguel Jacq
b7da267d4b #438 Make settings icon lighter grey when inactive 2017-06-02 11:34:19 +10:00
Miguel Jacq
e8304b861f Make it possible to supply a custom json settings file from somewhere else 2017-06-01 17:35:27 +10:00
Micah Lee
c7a800a79f Fix stdeb.cfg so that Ubuntu PPA will build 2017-05-31 15:04:10 -07:00
Miguel Jacq
802b90f19f Remove debug data 2017-05-31 19:44:53 +10:00
Miguel Jacq
69fc0e522a On a fresh share, delete any download progress bars of previous shares, and re-hide the downloads container 2017-05-31 17:35:16 +10:00
Delirious Lettuce
e57521f3d4 Uncomment after_success 2017-05-30 23:53:51 -06:00