Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] 91% test coverage of onionshare/common.py #415

Closed
wants to merge 58 commits into from
Closed

[WIP] 91% test coverage of onionshare/common.py #415

wants to merge 58 commits into from

Conversation

delirious-lettuce
Copy link
Contributor

@delirious-lettuce delirious-lettuce commented May 25, 2017 •
edited

@micahflee ,

This PR is still a work-in-progress but I wanted to give you an idea of what I've been doing to help with #404 . I will continue to work on it to try and achieve 100% coverage.

Let me know what you think!

delirious-lettuce and others added 15 commits May 24, 2017 21:20
@delirious-lettuce
* Use context manager inside of get_available_port
d4477ff 
* Rearrange imports, one per line
* Reuse original `import random` for `random.SystemRandom` (instead of a separate `from random import SystemRandom`)
* Two blank lines above each function definition
@delirious-lettuce
Use divmod to simplify the calculations, seconds==0 -> '0s'
979242b
@delirious-lettuce
[WIP] 72% test coverage of onionshare/common.py
f8c2173
@delirious-lettuce
Removed unnecessary brackets
cffc2dd
@mig5
Updated CHANGELOG for v1.1
752548a
@delirious-lettuce
Fix issue mentioned by @mig5
5880741
@delirious-lettuce
Run tests with pytest (preinstalled by TravisCI)
2483687
@delirious-lettuce
Replace 'nose' with 'pytest'
05fcf97
@delirious-lettuce
Modify import for TravisCI, add ZipWriter regex, add float tests for …
d27f9bc 
…`format_seconds`, add initial ZipWriter tests
@delirious-lettuce
Revert changes python3-pytest -> python3-nose
2677f19
@delirious-lettuce
Using pip instead of before_install as per TravisCI docs
fc4274e
@delirious-lettuce
Revert tests back that use original format_second vs #414
79ac729
@delirious-lettuce
Revert import
3691158
@delirious-lettuce
Blank __init__.py seems to fix the ImportError
18a0da8
@delirious-lettuce
Test log & set_debug, 91% lines covered in common.py
2729cee
@delirious-lettuce delirious-lettuce changed the title [WIP] 72% test coverage of onionshare/common.py [WIP] 91% test coverage of onionshare/common.py May 27, 2017
mig5 and others added 14 commits May 27, 2017 17:14
@mig5
Adds Settings and Help menu items to the systray
cc73c92
@mig5
Make it possible to delete multiple items from the list with a shift-…
91cf908 
…select
@mig5
minor reword in changelog
cb3f106
@mig5
Style a prettier progress bar
acf453e
@mig5
Remove border around items in the QStatusBar
0da4c87
@delirious-lettuce
Remove constant_time_compare to use hmac.compare_digest
dfd4079
@mig5
Improve the Zip progressbar style a little bit
84e1673
@mig5
Make adding of files/folders a single button
68089a9
@mig5
Fix file dialog by subclassing/overriding it, which allows for single…
8f79fc3 
… selection of a file or folder, as well as multiple
@mig5
reinstate the caption call
63745f4
@mig5
Make the tor connection progressBar similarly style as the others
6ad8b88
@mig5
Revert "Make the tor connection progressBar similarly style as the ot…
506cb55 
…hers"

This reverts commit 6ad8b88.
@micahflee
Merge branch 'delirious-lettuce-socket_context_manager'
3c1a568
@micahflee
Merge branch 'format_seconds' of https://github.com/delirious-lettuce…
da0a2d1 
…/onionshare into delirious-lettuce-format_seconds
@delirious-lettuce
Copy link
Contributor Author

delirious-lettuce commented May 30, 2017 •
edited

@micahflee ,

Yes, it's still in progress. I have some more work to do but I will try to kick it into high gear and get them done quickly.

I will make the changes you asked for in reference to nose to pytest.

Some of the pytest issues may be because the features I used are from a newer version of pytest than what is in the ubuntu/fedora repos. I'll try and figure out how to account for this (whether using a newer pytest from pip or backporting these tests to run with the older version of pytest). I'm not anywhere near as advanced as you so I would defer to you on whether using system installed versions are better than pip installed versions.

I saw this link as I've been going back and forth through the pytest docs and I thought I should be using fixtures instead of setup/teardown methods. But if that's what's causing the issues for you, I will convert them back to try and fix that issue of using an older version of pytest from the OS repos.

I was having similar problems on Travis because it didn't allow access to system installed Flask so I temporarily replaced it with pip install Flask and that allowed it the import to work (and the tests to subsequently run).

Thanks for your time, I will get working on these issues and will let you know when I have them solved!

micahflee and others added 18 commits May 30, 2017 12:21
@micahflee
Merge branch 'single_add_button' of https://github.com/mig5/onionshare …
c039ccd 
…into mig5-single_add_button
@micahflee
Merge branch 'mig5-single_add_button'
67db512
@micahflee
Updated changelog even more, and version bump to 1.1
baae8fa
@micahflee
Merge branch 'hmac_compare_digest' of https://github.com/delirious-le…
cd5d95a 
…ttuce/onionshare into delirious-lettuce-hmac_compare_digest
@micahflee
Merge branch 'delirious-lettuce-hmac_compare_digest'
b5fe8b7
@delirious-lettuce
[WIP] 72% test coverage of onionshare/common.py
0c6a407
@delirious-lettuce
Removed unnecessary brackets
23d68e8
@delirious-lettuce
Run tests with pytest (preinstalled by TravisCI)
b038775
@delirious-lettuce
Replace 'nose' with 'pytest'
cd93a7f
@delirious-lettuce
Modify import for TravisCI, add ZipWriter regex, add float tests for …
4e795de 
…`format_seconds`, add initial ZipWriter tests
@delirious-lettuce
Revert changes python3-pytest -> python3-nose
f938b07
@delirious-lettuce
Using pip instead of before_install as per TravisCI docs
cfb80af
@delirious-lettuce
Revert tests back that use original format_second vs #414
dd6dd00
@delirious-lettuce
Revert import
68ba631
@delirious-lettuce
Blank __init__.py seems to fix the ImportError
ee03448
@delirious-lettuce
Test log & set_debug, 91% lines covered in common.py
ce2fefa
@delirious-lettuce
98% lines covered, summary of changes:
f56c203 
* add new imports
* rename ZipWriter regex
* add more fixtures
* use classes to group related tests
* adjust expected results after # ? merge
* parametrize `get_available_port` test
* test three platforms instead of one
* initial tests for `get_resource_path` (work-in-progress)
* pass fixtures as args instead of `usefixtures` decorators
* add more tests for `ZipWriter.add_file
* ensure temporary files and directories are removed after tests
@delirious-lettuce
Merge remote-tracking branch 'origin/pytest_common_test' into pytest_…
e0d25a9 
…common_test

# Conflicts:
#	test/onionshare_common_test.py
@delirious-lettuce
Copy link
Contributor Author

I messed this up so I'm going to close this PR and re-submit it. Sorry for the confusion!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@delirious-lettuce @micahflee @mig5