diff --git a/platform/platform_tests/downloader_tests/downloader_test.cpp b/platform/platform_tests/downloader_tests/downloader_test.cpp index 07089ca8a2..f41bcb96c2 100644 --- a/platform/platform_tests/downloader_tests/downloader_test.cpp +++ b/platform/platform_tests/downloader_tests/downloader_test.cpp @@ -19,17 +19,18 @@ #include "defines.hpp" +namespace downloader_test +{ using namespace downloader; using namespace std::placeholders; using namespace std; -#define TEST_URL1 "http://localhost:34568/unit_tests/1.txt" -#define TEST_URL_404 "http://localhost:34568/unit_tests/notexisting_unittest" -#define TEST_URL_PERMANENT "http://localhost:34568/unit_tests/permanent" -#define TEST_URL_INVALID_HOST "http://not-valid-host123532.ath.cx" -#define TEST_URL_BIG_FILE "http://localhost:34568/unit_tests/47kb.file" -#define TEST_URL_HTTPS "https://github.com" -#define TEST_URL_POST "http://localhost:34568/unit_tests/post.php" +char constexpr kTestUrl1[] = "http://localhost:34568/unit_tests/1.txt"; +char constexpr kTestUrl404[] = "http://localhost:34568/unit_tests/notexisting_unittest"; +char constexpr kTestUrlBigFile[] = "http://localhost:34568/unit_tests/47kb.file"; + +// Should match file size in tools/python/ResponseProvider.py +int constexpr kBigFileSize = 47684; class DownloadObserver { @@ -145,7 +146,7 @@ UNIT_TEST(DownloaderSimpleGet) { // simple success case - unique_ptr const request(MakeRequest(TEST_URL1)); + unique_ptr const request {MakeRequest(kTestUrl1)}; // wait until download is finished QCoreApplication::exec(); observer.TestOk(); @@ -155,7 +156,7 @@ UNIT_TEST(DownloaderSimpleGet) observer.Reset(); { // We DO NOT SUPPORT redirects to avoid data corruption when downloading mwm files - unique_ptr const request(MakeRequest(TEST_URL_PERMANENT)); + unique_ptr const request {MakeRequest("http://localhost:34568/unit_tests/permanent")}; QCoreApplication::exec(); observer.TestFailed(); TEST_EQUAL(request->GetData().size(), 0, (request->GetData())); @@ -164,7 +165,7 @@ UNIT_TEST(DownloaderSimpleGet) observer.Reset(); { // fail case 404 - unique_ptr const request(MakeRequest(TEST_URL_404)); + unique_ptr const request {MakeRequest(kTestUrl404)}; QCoreApplication::exec(); observer.TestFileNotFound(); TEST_EQUAL(request->GetData().size(), 0, (request->GetData())); @@ -173,7 +174,7 @@ UNIT_TEST(DownloaderSimpleGet) observer.Reset(); { // fail case not existing host - unique_ptr const request(MakeRequest(TEST_URL_INVALID_HOST)); + unique_ptr const request {MakeRequest("http://not-valid-host123532.ath.cx")}; QCoreApplication::exec(); observer.TestFailed(); TEST_EQUAL(request->GetData().size(), 0, (request->GetData())); @@ -182,8 +183,8 @@ UNIT_TEST(DownloaderSimpleGet) { // cancel download in the middle of the progress CancelDownload canceler; - /// should be deleted in canceler - HttpRequest::Get(TEST_URL_BIG_FILE, + // should be deleted in canceler + HttpRequest::Get(kTestUrlBigFile, bind(&CancelDownload::OnFinish, &canceler, _1), bind(&CancelDownload::OnProgress, &canceler, _1)); QCoreApplication::exec(); @@ -192,7 +193,7 @@ UNIT_TEST(DownloaderSimpleGet) observer.Reset(); { // https success case - unique_ptr const request(MakeRequest(TEST_URL_HTTPS)); + unique_ptr const request {MakeRequest("https://github.com")}; // wait until download is finished QCoreApplication::exec(); observer.TestOk(); @@ -203,7 +204,7 @@ UNIT_TEST(DownloaderSimpleGet) // Delete request at the end of successful download DeleteOnFinish deleter; // should be deleted in deleter on finish - HttpRequest::Get(TEST_URL1, + HttpRequest::Get(kTestUrl1, bind(&DeleteOnFinish::OnFinish, &deleter, _1), bind(&DeleteOnFinish::OnProgress, &deleter, _1)); QCoreApplication::exec(); @@ -212,38 +213,29 @@ UNIT_TEST(DownloaderSimpleGet) UNIT_TEST(DownloaderSimplePost) { + // simple success case + string const postData = "{\"jsonKey\":\"jsonValue\"}"; DownloadObserver observer; - { - // simple success case - string const postData = "{\"jsonKey\":\"jsonValue\"}"; - unique_ptr const request(HttpRequest::PostJson(TEST_URL_POST, postData, - bind(&DownloadObserver::OnDownloadFinish, &observer, _1), - bind(&DownloadObserver::OnDownloadProgress, &observer, _1))); - // wait until download is finished - QCoreApplication::exec(); - observer.TestOk(); - TEST_EQUAL(request->GetData(), postData, ()); - } + unique_ptr const request {HttpRequest::PostJson("http://localhost:34568/unit_tests/post.php", postData, + bind(&DownloadObserver::OnDownloadFinish, &observer, _1), + bind(&DownloadObserver::OnDownloadProgress, &observer, _1))}; + // wait until download is finished + QCoreApplication::exec(); + observer.TestOk(); + TEST_EQUAL(request->GetData(), postData, ()); } UNIT_TEST(ChunksDownloadStrategy) { - string const S1 = "UrlOfServer1"; - string const S2 = "UrlOfServer2"; - string const S3 = "UrlOfServer3"; + vector const servers = {"UrlOfServer1", "UrlOfServer2", "UrlOfServer3"}; typedef pair RangeT; - RangeT const R1(0, 249), R2(250, 499), R3(500, 749), R4(750, 800); + RangeT const R1{0, 249}, R2{250, 499}, R3{500, 749}, R4{750, 800}; - vector servers; - servers.push_back(S1); - servers.push_back(S2); - servers.push_back(S3); - - int64_t const FILE_SIZE = 800; - int64_t const CHUNK_SIZE = 250; + int64_t constexpr kFileSize = 800; + int64_t constexpr kChunkSize = 250; ChunksDownloadStrategy strategy(servers); - strategy.InitChunks(FILE_SIZE, CHUNK_SIZE); + strategy.InitChunks(kFileSize, kChunkSize); string s1; RangeT r1; @@ -309,19 +301,14 @@ UNIT_TEST(ChunksDownloadStrategy) UNIT_TEST(ChunksDownloadStrategyFAIL) { - string const S1 = "UrlOfServer1"; - string const S2 = "UrlOfServer2"; + vector const servers = {"UrlOfServer1", "UrlOfServer2"}; typedef pair RangeT; - vector servers; - servers.push_back(S1); - servers.push_back(S2); - - int64_t const FILE_SIZE = 800; - int64_t const CHUNK_SIZE = 250; + int64_t constexpr kFileSize = 800; + int64_t constexpr kChunkSize = 250; ChunksDownloadStrategy strategy(servers); - strategy.InitChunks(FILE_SIZE, CHUNK_SIZE); + strategy.InitChunks(kFileSize, kChunkSize); string s1; RangeT r1; @@ -343,74 +330,70 @@ UNIT_TEST(ChunksDownloadStrategyFAIL) namespace { - string ReadFileAsString(string const & file) - { - try - { - FileReader f(file); - string s; - f.ReadAsString(s); - return s; - } - catch (FileReader::Exception const &) - { - TEST(false, ("File ", file, " should exist")); - return string(); - } - } - - void FinishDownloadSuccess(string const & file) - { - TEST(base::DeleteFileX(file), ("Result file should present on success")); - - uint64_t size; - TEST(!base::GetFileSize(file + DOWNLOADING_FILE_EXTENSION, size), ("No downloading file on success")); - TEST(!base::GetFileSize(file + RESUME_FILE_EXTENSION, size), ("No resume file on success")); - } - - void FinishDownloadFail(string const & file) - { - uint64_t size; - TEST(!base::GetFileSize(file, size), ("No result file on fail")); - - (void)base::DeleteFileX(file + DOWNLOADING_FILE_EXTENSION); - - TEST(base::DeleteFileX(file + RESUME_FILE_EXTENSION), ("Resume file should present on fail")); - } -} - -namespace +string ReadFileAsString(string const & file) { - void DeleteTempDownloadFiles() + try { - // Remove data from previously failed files. - - // Get regexp like this: (\.downloading3$|\.resume3$) - string const regexp = "(\\" RESUME_FILE_EXTENSION "$|\\" DOWNLOADING_FILE_EXTENSION "$)"; - - Platform::FilesList files; - Platform::GetFilesByRegExp(".", regexp, files); - for (Platform::FilesList::iterator it = files.begin(); it != files.end(); ++it) - FileWriter::DeleteFileX(*it); + FileReader f(file); + string s; + f.ReadAsString(s); + return s; } + catch (FileReader::Exception const &) + { + TEST(false, ("File ", file, " should exist")); + return string(); + } +} // namespace + +void FinishDownloadSuccess(string const & file) +{ + TEST(base::DeleteFileX(file), ("Result file should present on success")); + + uint64_t size; + TEST(!base::GetFileSize(file + DOWNLOADING_FILE_EXTENSION, size), ("No downloading file on success")); + TEST(!base::GetFileSize(file + RESUME_FILE_EXTENSION, size), ("No resume file on success")); } +void FinishDownloadFail(string const & file) +{ + uint64_t size; + TEST(!base::GetFileSize(file, size), ("No result file on fail")); + + (void)base::DeleteFileX(file + DOWNLOADING_FILE_EXTENSION); + + TEST(base::DeleteFileX(file + RESUME_FILE_EXTENSION), ("Resume file should present on fail")); +} + +void DeleteTempDownloadFiles() +{ + // Remove data from previously failed files. + + // Get regexp like this: (\.downloading3$|\.resume3$) + string const regexp = "(\\" RESUME_FILE_EXTENSION "$|\\" DOWNLOADING_FILE_EXTENSION "$)"; + + Platform::FilesList files; + Platform::GetFilesByRegExp(".", regexp, files); + for (Platform::FilesList::iterator it = files.begin(); it != files.end(); ++it) + FileWriter::DeleteFileX(*it); +} +} // namespace + + UNIT_TEST(DownloadChunks) { - string const FILENAME = "some_downloader_test_file"; + string const kFileName = "some_downloader_test_file"; // remove data from previously failed files DeleteTempDownloadFiles(); - vector urls; - urls.push_back(TEST_URL1); - urls.push_back(TEST_URL1); - int64_t FILESIZE = 5; + vector urls = {kTestUrl1, kTestUrl1}; + int64_t fileSize = 5; DownloadObserver observer; auto const MakeRequest = [&](int64_t chunkSize) { - return HttpRequest::GetFile(urls, FILENAME, FILESIZE, + return HttpRequest::GetFile(urls, kFileName, fileSize, bind(&DownloadObserver::OnDownloadFinish, &observer, _1), bind(&DownloadObserver::OnDownloadProgress, &observer, _1), chunkSize); @@ -418,132 +401,101 @@ UNIT_TEST(DownloadChunks) { // should use only one thread - unique_ptr const request(MakeRequest(512 * 1024)); + unique_ptr const request {MakeRequest(512 * 1024)}; // wait until download is finished QCoreApplication::exec(); - observer.TestOk(); - - TEST_EQUAL(request->GetData(), FILENAME, ()); - TEST_EQUAL(ReadFileAsString(FILENAME), "Test1", ()); - - FinishDownloadSuccess(FILENAME); + TEST_EQUAL(request->GetData(), kFileName, ()); + TEST_EQUAL(ReadFileAsString(kFileName), "Test1", ()); + FinishDownloadSuccess(kFileName); } observer.Reset(); - - urls.clear(); - urls.push_back(TEST_URL_BIG_FILE); - urls.push_back(TEST_URL_BIG_FILE); - urls.push_back(TEST_URL_BIG_FILE); - FILESIZE = 5; - + urls = {kTestUrlBigFile, kTestUrlBigFile, kTestUrlBigFile}; + fileSize = 5; { // 3 threads - fail, because of invalid size - unique_ptr const request(MakeRequest(2048)); + [[maybe_unused]] unique_ptr const request {MakeRequest(2048)}; // wait until download is finished QCoreApplication::exec(); - observer.TestFailed(); - - FinishDownloadFail(FILENAME); + FinishDownloadFail(kFileName); } observer.Reset(); - - urls.clear(); - urls.push_back(TEST_URL_BIG_FILE); - urls.push_back(TEST_URL_BIG_FILE); - urls.push_back(TEST_URL_BIG_FILE); - FILESIZE = 47684; - + urls = {kTestUrlBigFile, kTestUrlBigFile, kTestUrlBigFile}; + fileSize = kBigFileSize; { // 3 threads - succeeded - unique_ptr const request(MakeRequest(2048)); + [[maybe_unused]] unique_ptr const request {MakeRequest(2048)}; // wait until download is finished QCoreApplication::exec(); - observer.TestOk(); - - FinishDownloadSuccess(FILENAME); + FinishDownloadSuccess(kFileName); } observer.Reset(); - - urls.clear(); - urls.push_back(TEST_URL_BIG_FILE); - urls.push_back(TEST_URL1); - urls.push_back(TEST_URL_404); - FILESIZE = 47684; - + urls = {kTestUrlBigFile, kTestUrl1, kTestUrl404}; + fileSize = kBigFileSize; { // 3 threads with only one valid url - succeeded - unique_ptr const request(MakeRequest(2048)); - + [[maybe_unused]] unique_ptr const request {MakeRequest(2048)}; // wait until download is finished QCoreApplication::exec(); - observer.TestOk(); - - FinishDownloadSuccess(FILENAME); + FinishDownloadSuccess(kFileName); } observer.Reset(); - - urls.clear(); - urls.push_back(TEST_URL_BIG_FILE); - urls.push_back(TEST_URL_BIG_FILE); - FILESIZE = 12345; - + urls = {kTestUrlBigFile, kTestUrlBigFile}; + fileSize = 12345; { // 2 threads and all points to file with invalid size - fail - unique_ptr const request(MakeRequest(2048)); + [[maybe_unused]] unique_ptr const request {MakeRequest(2048)}; // wait until download is finished QCoreApplication::exec(); - observer.TestFailed(); - - FinishDownloadFail(FILENAME); + FinishDownloadFail(kFileName); } } namespace { - int64_t FILESIZE = 47684; - int64_t const beg1 = 123, end1 = 1230, beg2 = 44000, end2 = 47683; +int64_t constexpr beg1 = 123, end1 = 1230, beg2 = 44000, end2 = 47683; - struct ResumeChecker +struct ResumeChecker +{ + size_t m_counter; + ResumeChecker() : m_counter(0) {} + + void OnProgress(HttpRequest & request) { - size_t m_counter; - ResumeChecker() : m_counter(0) {} - - void OnProgress(HttpRequest & request) + if (m_counter == 0) { - if (m_counter == 0) - { - TEST_EQUAL(request.GetProgress().m_bytesDownloaded, beg2, ()); - TEST_EQUAL(request.GetProgress().m_bytesTotal, FILESIZE, ()); - } - else if (m_counter == 1) - { - TEST_EQUAL(request.GetProgress().m_bytesDownloaded, FILESIZE, ()); - TEST_EQUAL(request.GetProgress().m_bytesTotal, FILESIZE, ()); - } - else - { - TEST(false, ("Progress should be called exactly 2 times")); - } - ++m_counter; + TEST_EQUAL(request.GetProgress().m_bytesDownloaded, beg2, ()); + TEST_EQUAL(request.GetProgress().m_bytesTotal, kBigFileSize, ()); } - - void OnFinish(HttpRequest & request) + else if (m_counter == 1) { - TEST_EQUAL(request.GetStatus(), DownloadStatus::Completed, ()); - QCoreApplication::exit(); + TEST_EQUAL(request.GetProgress().m_bytesDownloaded, kBigFileSize, ()); + TEST_EQUAL(request.GetProgress().m_bytesTotal, kBigFileSize, ()); } - }; -} + else + { + TEST(false, ("Progress should be called exactly 2 times")); + } + ++m_counter; + } + + void OnFinish(HttpRequest & request) + { + TEST_EQUAL(request.GetStatus(), DownloadStatus::Completed, ()); + QCoreApplication::exit(); + } +}; +} // namespace + UNIT_TEST(DownloadResumeChunks) { @@ -554,14 +506,13 @@ UNIT_TEST(DownloadResumeChunks) // remove data from previously failed files DeleteTempDownloadFiles(); - vector urls; - urls.push_back(TEST_URL_BIG_FILE); + vector urls = {kTestUrlBigFile}; // 1st step - download full file { DownloadObserver observer; - unique_ptr const request(HttpRequest::GetFile(urls, FILENAME, FILESIZE, + unique_ptr const request(HttpRequest::GetFile(urls, FILENAME, kBigFileSize, bind(&DownloadObserver::OnDownloadFinish, &observer, _1), bind(&DownloadObserver::OnDownloadProgress, &observer, _1))); @@ -593,13 +544,13 @@ UNIT_TEST(DownloadResumeChunks) strategy.AddChunk(make_pair(end1+1, beg2-1), ChunksDownloadStrategy::CHUNK_COMPLETE); strategy.AddChunk(make_pair(beg2, end2), ChunksDownloadStrategy::CHUNK_FREE); - strategy.SaveChunks(FILESIZE, RESUME_FILENAME); + strategy.SaveChunks(kBigFileSize, RESUME_FILENAME); } // 3rd step - check that resume works { ResumeChecker checker; - unique_ptr const request(HttpRequest::GetFile(urls, FILENAME, FILESIZE, + unique_ptr const request(HttpRequest::GetFile(urls, FILENAME, kBigFileSize, bind(&ResumeChecker::OnFinish, &checker, _1), bind(&ResumeChecker::OnProgress, &checker, _1))); QCoreApplication::exec(); @@ -616,8 +567,7 @@ UNIT_TEST(DownloadResumeChunksWithCancel) // remove data from previously failed files DeleteTempDownloadFiles(); - vector urls; - urls.push_back(TEST_URL_BIG_FILE); + vector urls = {kTestUrlBigFile}; DownloadObserver observer; @@ -628,7 +578,7 @@ UNIT_TEST(DownloadResumeChunksWithCancel) if (arrCancelChunks[i] > 0) observer.CancelDownloadOnGivenChunk(arrCancelChunks[i]); - unique_ptr const request(HttpRequest::GetFile(urls, FILENAME, FILESIZE, + unique_ptr const request(HttpRequest::GetFile(urls, FILENAME, kBigFileSize, bind(&DownloadObserver::OnDownloadFinish, &observer, _1), bind(&DownloadObserver::OnDownloadProgress, &observer, _1), 1024, false)); @@ -640,3 +590,5 @@ UNIT_TEST(DownloadResumeChunksWithCancel) FinishDownloadSuccess(FILENAME); } + +} // namespace downloader_test \ No newline at end of file diff --git a/tools/python/ResponseProvider.py b/tools/python/ResponseProvider.py index 07b8483c4b..1a7cc571aa 100644 --- a/tools/python/ResponseProvider.py +++ b/tools/python/ResponseProvider.py @@ -4,7 +4,7 @@ import jsons import logging import os - +# Should match size defined in platform/platform_tests/downloader_tests/downloader_test.cpp BIG_FILE_SIZE = 47684 @@ -13,15 +13,15 @@ class Payload: self.__response_code = response_code self.__message = message if type(message) is bytes else message.encode('utf8') self.__headers = headers - - + + def response_code(self): """ Response code to send to the client. """ return self.__response_code - - + + def message(self): """ The message to send to the client. @@ -50,11 +50,11 @@ class Payload: class ResponseProviderMixin: """ -A mixin (basically, an interface) that the web-server that we might use relies on. +A mixin (basically, an interface) that the web-server that we might use relies on. In this implementation, the job of the web-server is just to get the request (the url and the headers), and to send the response as it knows how. It isn't -its job to decide how to respond to what request. It is the job of the +its job to decide how to respond to what request. It is the job of the ResponseProvider. In your web-server you should initialize the ResponseProvider, and ask it for @@ -72,24 +72,24 @@ of servers send to check if other servers are currently serving. kill(self) - someone sent the kill request, which means that that someone no longer needs this server to serve. You might want to decrement the count of -active users and/or stop the server. +active users and/or stop the server. """ - + def dispatch_response(self, payload): """ Define this mehtod to dispatch the response received from the ResponseProvider """ raise NotImplementedError() - + def got_pinged(self): """ - A ping request has been received. In most scenarios it means that the number of + A ping request has been received. In most scenarios it means that the number of users of this server has increased by 1. """ raise NotImplementedError() - - + + def kill(self): """ Someone no longer needs this server. Decrement the number of users and stop @@ -105,8 +105,8 @@ class ResponseProvider: self.byterange = None self.is_chunked = False self.response_code = 200 - - + + def pong(self): self.delegate.got_pinged() return Payload("pong") @@ -182,7 +182,7 @@ class ResponseProvider: size = len(init_message) self.check_byterange(size) headers = self.chunked_response_header(size) - + return Payload(message, self.response_code, headers) @@ -192,7 +192,7 @@ class ResponseProvider: def test_301(self): return Payload("", 301, {"Location" : "google.com"}) - + def check_byterange(self, size): if self.byterange is None: @@ -203,8 +203,8 @@ class ResponseProvider: "Content-Range" : "bytes {start}-{end}/{out_of}".format(start=self.byterange[0], end=self.byterange[1], out_of=size) } - - + + def test_47_kb(self): self.check_byterange(BIG_FILE_SIZE) headers = self.chunked_response_header(BIG_FILE_SIZE) @@ -212,7 +212,7 @@ class ResponseProvider: return Payload(message, self.response_code, headers) - + def message_for_47kb_file(self): message = [] for i in range(0, BIG_FILE_SIZE + 1): diff --git a/tools/python/run_desktop_tests.py b/tools/python/run_desktop_tests.py index ff2e2820b1..8c225745e0 100755 --- a/tools/python/run_desktop_tests.py +++ b/tools/python/run_desktop_tests.py @@ -80,7 +80,7 @@ class TestRunner: self.boost_tests = options.boost_tests if self.runlist: - logging.warn("-i or -b option found, the -e option will be ignored") + logging.warning("-i or -b option found, the -e option will be ignored") self.workspace_path = options.folder self.data_path = (f" --data_path={options.data_path}" if options.data_path else "") diff --git a/tools/python/testserver.py b/tools/python/testserver.py index fe9be8d404..d6953ba719 100644 --- a/tools/python/testserver.py +++ b/tools/python/testserver.py @@ -1,28 +1,28 @@ """ -This is a simple web-server that does very few things. It is necessary for -the downloader tests. +This is a simple web-server that does very few things. It is necessary for +the downloader tests. Here is the logic behind the initialization: -Because several instances of the test can run simultaneously on the Build -machine, we have to take this into account and not start another server if +Because several instances of the test can run simultaneously on the Build +machine, we have to take this into account and not start another server if one is already running. However, there is a chance that a server will not -terminate correctly, and will still hold the port, so we will not be able -to initialize another server. +terminate correctly, and will still hold the port, so we will not be able +to initialize another server. So before initializing the server, we check if any processes are using the port that we want to use. If we find such a process, we assume that it might be -working, and wait for about 10 seconds for it to start serving. If it does not, -we kill it. +working, and wait for about 10 seconds for it to start serving. If it does not, +we kill it. Next, we check the name of our process and see if there are other processes -with the same name. If there are, we assume that they might start serving any +with the same name. If there are, we assume that they might start serving any moment. So we iterate over the ones that have PID lower than ours, and wait for them to start serving. If a process doesn't serve, we kill it. If we have killed (or someone has) all the processes with PIDs lower than ours, we try to start serving. If we succeed, we kill all other processes with the same name as ours. If we don't someone else will kill us. - + """ @@ -48,15 +48,15 @@ import logging.config try: from tornado_handler import MainHandler USE_TORNADO = True -except: +except: USE_TORNADO = False logging.basicConfig(format='%(asctime)s %(message)s', level=logging.DEBUG) PORT = 34568 -LIFESPAN = 180.0 # timeout for the self destruction timer - how much time - # passes between the last request and the server killing +LIFESPAN = 180.0 # timeout for the self destruction timer - how much time + # passes between the last request and the server killing # itself PING_TIMEOUT = 5 # Nubmer of seconds to wait for ping response @@ -76,12 +76,12 @@ class InternalServer(HTTPServer): self.self_destruct_timer.start() - def __init__(self, server_address, RequestHandlerClass, + def __init__(self, server_address, RequestHandlerClass, bind_and_activate=True): - HTTPServer.__init__(self, server_address, RequestHandlerClass, + HTTPServer.__init__(self, server_address, RequestHandlerClass, bind_and_activate=bind_and_activate) - + self.self_destruct_timer = None self.clients = 1 self.reset_selfdestruct_timer() @@ -100,14 +100,14 @@ class InternalServer(HTTPServer): class TestServer: def __init__(self): - + self.may_serve = False - + pid = os.getpid() logging.info(f"Init server. Pid: {pid}") - + self.server = None - + killer = SiblingKiller(PORT, PING_TIMEOUT) killer.kill_siblings() if killer.allow_serving(): @@ -126,25 +126,25 @@ class TestServer: logging.info(f"Not allowed to start serving for process: {pid}") def init_server(self): - + if USE_TORNADO: MainHandler.init_server(PORT, LIFESPAN) else: print(""" ************* WARNING: Using the python's built-in BaseHTTPServer! -It is all right if you run the tests on your local machine, but if you are running tests on a server, +It is all right if you run the tests on your local machine, but if you are running tests on a server, please consider installing Tornado. It is a much more powerful web-server. Otherwise you will find that some of your downloader tests either fail or hang. -do +do sudo pip install tornado or go to http://www.tornadoweb.org/en/stable/ for more detail. ************* """) - + self.server = InternalServer(('localhost', PORT), PostHandler) @@ -152,10 +152,10 @@ or go to http://www.tornadoweb.org/en/stable/ for more detail. def start_serving(self): if not self.may_serve: return - + if USE_TORNADO: MainHandler.start_serving() - + else: thread = threading.Thread(target=self.server.serve_forever) thread.deamon = True @@ -163,17 +163,17 @@ or go to http://www.tornadoweb.org/en/stable/ for more detail. class PostHandler(BaseHTTPRequestHandler, ResponseProviderMixin): - + def dispatch_response(self, payload): - + self.send_response(payload.response_code()) for h in payload.headers(): self.send_header(h, payload.headers()[h]) self.send_header("Content-Length", payload.length()) self.end_headers() self.wfile.write(payload.message()) - - + + def init_vars(self): self.response_provider = ResponseProvider(self) @@ -201,7 +201,7 @@ class PostHandler(BaseHTTPRequestHandler, ResponseProviderMixin): for h in self.headers: ret[h.lower()] = self.headers.get(h) return ret - + def got_pinged(self): self.server.clients += 1 @@ -213,6 +213,6 @@ class PostHandler(BaseHTTPRequestHandler, ResponseProviderMixin): if __name__ == '__main__': - + server = TestServer() server.start_serving()