From 5753ed4a72ec727b23960f8deaaf6a3c315a257b Mon Sep 17 00:00:00 2001 From: Darshit Shah Date: Mon, 28 Jul 2014 14:32:13 +0530 Subject: [PATCH] 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. --- testenv/ChangeLog | 8 ++++++++ testenv/conf/server_conf.py | 11 ----------- testenv/server/http/http_server.py | 6 ------ 3 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 testenv/conf/server_conf.py diff --git a/testenv/ChangeLog b/testenv/ChangeLog index fe910884..64d75af3 100644 --- a/testenv/ChangeLog +++ b/testenv/ChangeLog @@ -1,3 +1,11 @@ +2014-08-04 Darshit Shah + + * 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 * Test-*.py: Remove the '-d' switch from WGET_OPTIONS. diff --git a/testenv/conf/server_conf.py b/testenv/conf/server_conf.py deleted file mode 100644 index c287bd70..00000000 --- a/testenv/conf/server_conf.py +++ /dev/null @@ -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) diff --git a/testenv/server/http/http_server.py b/testenv/server/http/http_server.py index e554a105..aa26e601 100644 --- a/testenv/server/http/http_server.py +++ b/testenv/server/http/http_server.py @@ -35,10 +35,6 @@ class StoppableHTTPServer (HTTPServer): self.server_configs = conf_dict 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): return self.request_headers @@ -457,8 +453,6 @@ class HTTPd (threading.Thread): def server_conf (self, 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):