pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed the downloader tests. Now let's clean them up a bit (if needed)

Browse source
This commit is contained in:
Timofey 2015-06-05 16:20:24 +03:00 • committed by Alex Zolotarev
parent 8becb96355
commit aa7484c9de
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/platform_tests/downloader_test.cpp
View file

@ -433,7 +433,7 @@ UNIT_TEST(DownloadChunks)
FinishDownloadFail(FILENAME);
}
string const SHA256 = "3CE28B04BCC3006124A5324B2B145C94F6AEC613BC4135DCEF6E57C436B41B89";
string const SHA256 = "49F7BC24B6137C339DFE2D538EE533C7DC6AF89FACBCCE750D7B682C77D61FB1";
observer.Reset();
@ -541,7 +541,7 @@ UNIT_TEST(DownloadResumeChunks)
string const FILENAME = "some_test_filename_12345";
string const RESUME_FILENAME = FILENAME + RESUME_FILE_EXTENSION;
string const DOWNLOADING_FILENAME = FILENAME + DOWNLOADING_FILE_EXTENSION;
string const SHA256 = "3CE28B04BCC3006124A5324B2B145C94F6AEC613BC4135DCEF6E57C436B41B89";
string const SHA256 = "49F7BC24B6137C339DFE2D538EE533C7DC6AF89FACBCCE750D7B682C77D61FB1";
// remove data from previously failed files
DeleteTempDownloadFiles();
@ -607,7 +607,7 @@ UNIT_TEST(DownloadResumeChunks)
UNIT_TEST(DownloadResumeChunksWithCancel)
{
string const FILENAME = "some_test_filename_12345";
string const SHA256 = "3CE28B04BCC3006124A5324B2B145C94F6AEC613BC4135DCEF6E57C436B41B89";
string const SHA256 = "49F7BC24B6137C339DFE2D538EE533C7DC6AF89FACBCCE750D7B682C77D61FB1";
// remove data from previously failed files
DeleteTempDownloadFiles();

27
tools/testserver.py
View file

@ -236,6 +236,19 @@ class PostHandler(BaseHTTPRequestHandler):
self.wfile.write("pong")
def message_for_47kb_file(self):
message = []
for i in range(0, BIG_FILE_SIZE + 1):
message.append(chr(i / 256))
message.append(chr(i % 256))
# print("{}{}\n".format(i/256, i%256))
return "".join(message)
def test1(self):
message = "Test1"
message = self.trim_message(message)
@ -263,7 +276,9 @@ class PostHandler(BaseHTTPRequestHandler):
def test_47_kb(self):
self.send_response(self.response_code)
length = BIG_FILE_SIZE
if self.byterange is not None:
if self.byterange is None:
self.byterange = (0, BIG_FILE_SIZE)
else:
length = min([length, self.byterange[1] - self.byterange[0] + 1])
# print ("The length of message to return is: {0}".format(length))
@ -272,9 +287,15 @@ class PostHandler(BaseHTTPRequestHandler):
if self.byterange is not None:
self.send_header("Content-Range", "bytes {start}-{end}/{out_of}".format(start=self.byterange[0], end=self.byterange[1], out_of=BIG_FILE_SIZE))
self.end_headers()
for i in range(0, length + 1):
message = self.message_for_47kb_file()
if message is None:
print("The message is none for some reason")
self.wfile.write(self.message_for_47kb_file()[self.byterange[0]: self.byterange[1] + 1])
# for i in range(0, length + 1):
# try:
self.wfile.write(chr(i%256))
# self.wfile.write(chr(i%256))
# except IOError, e:
# if e.errno == errno.EPIPE:
# print("This is indeed a broken pipe")