mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
Minor cleanup in the test suite
The server_conf hook and the server_sett() methods were no longer required. The server configuration is currently being done by server_conf() method in the server.
This commit is contained in:
parent
03f8babefe
commit
5753ed4a72
@ -1,3 +1,11 @@
|
|||||||
|
2014-08-04 Darshit Shah <darnir@gmail.com>
|
||||||
|
|
||||||
|
* conf/server_conf.py: Delete file. Server configuration is now done via the
|
||||||
|
server_conf() method.
|
||||||
|
* server/http/http_server.py (StppableHTTPServer.server_sett): Delete
|
||||||
|
method required by the above hook
|
||||||
|
(HTTPd.server_sett): Same
|
||||||
|
|
||||||
2014-07-26 Darshit Shah <darnir@gmail.com>
|
2014-07-26 Darshit Shah <darnir@gmail.com>
|
||||||
|
|
||||||
* Test-*.py: Remove the '-d' switch from WGET_OPTIONS.
|
* Test-*.py: Remove the '-d' switch from WGET_OPTIONS.
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
from conf import hook
|
|
||||||
|
|
||||||
|
|
||||||
@hook()
|
|
||||||
class ServerConf:
|
|
||||||
def __init__(self, server_settings):
|
|
||||||
self.server_settings = server_settings
|
|
||||||
|
|
||||||
def __call__(self, test_obj):
|
|
||||||
for server in test_obj.servers:
|
|
||||||
server.server_sett(self.server_settings)
|
|
@ -35,10 +35,6 @@ class StoppableHTTPServer (HTTPServer):
|
|||||||
self.server_configs = conf_dict
|
self.server_configs = conf_dict
|
||||||
self.fileSys = filelist
|
self.fileSys = filelist
|
||||||
|
|
||||||
def server_sett (self, settings):
|
|
||||||
for settings_key in settings:
|
|
||||||
setattr (self.RequestHandlerClass, settings_key, settings[settings_key])
|
|
||||||
|
|
||||||
def get_req_headers (self):
|
def get_req_headers (self):
|
||||||
return self.request_headers
|
return self.request_headers
|
||||||
|
|
||||||
@ -457,8 +453,6 @@ class HTTPd (threading.Thread):
|
|||||||
def server_conf (self, file_list, server_rules):
|
def server_conf (self, file_list, server_rules):
|
||||||
self.server_inst.server_conf (file_list, server_rules)
|
self.server_inst.server_conf (file_list, server_rules)
|
||||||
|
|
||||||
def server_sett (self, settings):
|
|
||||||
self.server_inst.server_sett (settings)
|
|
||||||
|
|
||||||
class HTTPSd (HTTPd):
|
class HTTPSd (HTTPd):
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user