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

Fixes parameters in the test function

Browse Source
This commit is contained in:
Saptak S 2021-03-30 21:20:59 +05:30
parent 4a7c062dbd
commit 157ffc9ba5
No known key found for this signature in database
GPG Key ID: 2D9B32E54C68A3FB
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/onionshare_cli/web/share_mode.py
View File

@ -313,7 +313,7 @@ class ShareModeWeb(SendBaseModeWeb):
# tell GUI the progress # tell GUI the progress
downloaded_bytes = fp.tell() downloaded_bytes = fp.tell()
percent = (1.0 * downloaded_bytes / self.filesize) * 100 percent = (1.0 * downloaded_bytes / filesize) * 100
bytes_left -= read_size bytes_left -= read_size
# only output to stdout if running onionshare in CLI mode, or if using Linux (#203, #304) # only output to stdout if running onionshare in CLI mode, or if using Linux (#203, #304)

36
cli/tests/test_cli_web.py
View File

@ -312,8 +312,8 @@ class TestRangeRequests:
with pytest.raises(RequestedRangeNotSatisfiable): with pytest.raises(RequestedRangeNotSatisfiable):
parse_range_header(invalid, 500) parse_range_header(invalid, 500)
def test_headers(self, common_obj): def test_headers(self, temp_dir, common_obj):
web = web_obj(common_obj, 'share', 3) web = web_obj(temp_dir, common_obj, "share", 3)
web.stay_open = True web.stay_open = True
url = '/download' url = '/download'
@ -325,8 +325,8 @@ class TestRangeRequests:
assert resp.headers.get('Content-Length') is not None assert resp.headers.get('Content-Length') is not None
assert 'Accept-Encoding' in resp.headers['Vary'] assert 'Accept-Encoding' in resp.headers['Vary']
def test_basic(self, common_obj): def test_basic(self, temp_dir, common_obj):
web = web_obj(common_obj, 'share', 3) web = web_obj(temp_dir, common_obj, "share", 3)
web.stay_open = True web.stay_open = True
url = '/download' url = '/download'
with open(web.share_mode.download_filename, 'rb') as f: with open(web.share_mode.download_filename, 'rb') as f:
@ -337,8 +337,8 @@ class TestRangeRequests:
assert resp.status_code == 200 assert resp.status_code == 200
assert resp.data == contents assert resp.data == contents
def test_reassemble(self, common_obj): def test_reassemble(self, temp_dir, common_obj):
web = web_obj(common_obj, 'share', 3) web = web_obj(temp_dir, common_obj, "share", 3)
web.stay_open = True web.stay_open = True
url = '/download' url = '/download'
with open(web.share_mode.download_filename, 'rb') as f: with open(web.share_mode.download_filename, 'rb') as f:
@ -363,13 +363,13 @@ class TestRangeRequests:
assert bytes_out == contents assert bytes_out == contents
def test_mismatched_etags(self, common_obj): def test_mismatched_etags(self, temp_dir, common_obj):
'''RFC 7233 Section 3.2 '''RFC 7233 Section 3.2
The "If-Range" header field allows a client to "short-circuit" the second request. The "If-Range" header field allows a client to "short-circuit" the second request.
Informally, its meaning is as follows: if the representation is unchanged, send me the Informally, its meaning is as follows: if the representation is unchanged, send me the
part(s) that I am requesting in Range; otherwise, send me the entire representation. part(s) that I am requesting in Range; otherwise, send me the entire representation.
''' '''
web = web_obj(common_obj, 'share', 3) web = web_obj(temp_dir, common_obj, "share", 3)
web.stay_open = True web.stay_open = True
url = '/download' url = '/download'
with open(web.share_mode.download_filename, 'rb') as f: with open(web.share_mode.download_filename, 'rb') as f:
@ -386,8 +386,8 @@ class TestRangeRequests:
assert resp.status_code == 200 assert resp.status_code == 200
assert resp.data == contents assert resp.data == contents
def test_if_unmodified_since(self, common_obj): def test_if_unmodified_since(self, temp_dir, common_obj):
web = web_obj(common_obj, 'share', 3) web = web_obj(temp_dir, common_obj, "share", 3)
web.stay_open = True web.stay_open = True
url = '/download' url = '/download'
@ -401,8 +401,8 @@ class TestRangeRequests:
resp = client.get(url, headers=headers) resp = client.get(url, headers=headers)
assert resp.status_code == 304 assert resp.status_code == 304
def test_firefox_like_behavior(self, common_obj): def test_firefox_like_behavior(self, temp_dir, common_obj):
web = web_obj(common_obj, 'share', 3) web = web_obj(temp_dir, common_obj, "share", 3)
web.stay_open = True web.stay_open = True
url = '/download' url = '/download'
@ -429,8 +429,8 @@ class TestRangeRequests:
return h return h
@check_unsupported('curl', ['--version']) @check_unsupported('curl', ['--version'])
def test_curl(self, common_obj): def test_curl(self, temp_dir, common_obj):
web = web_obj(common_obj, 'share', 3) web = web_obj(temp_dir, common_obj, "share", 3)
web.stay_open = True web.stay_open = True
with live_server(web) as url: with live_server(web) as url:
@ -439,8 +439,8 @@ class TestRangeRequests:
subprocess.check_call(['curl', '--continue-at', '10', url]) subprocess.check_call(['curl', '--continue-at', '10', url])
@check_unsupported('wget', ['--version']) @check_unsupported('wget', ['--version'])
def test_wget(self, tmpdir, common_obj): def test_wget(self, temp_dir, tmpdir, common_obj):
web = web_obj(common_obj, 'share', 3) web = web_obj(temp_dir, common_obj, "share", 3)
web.stay_open = True web.stay_open = True
# wget needs a file to exist to continue # wget needs a file to exist to continue
@ -452,8 +452,8 @@ class TestRangeRequests:
@check_unsupported('http', ['--version']) @check_unsupported('http', ['--version'])
def test_httpie(self, common_obj): def test_httpie(self, temp_dir, common_obj):
web = web_obj(common_obj, 'share', 3) web = web_obj(temp_dir, common_obj, "share", 3)
web.stay_open = True web.stay_open = True
with live_server(web) as url: with live_server(web) as url: