Index: net/tools/testserver/testserver.py |
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py |
index d442671085fa2acebd94c70b435b871b52cd642a..b323e6779d01d9526dfe8c6966ae4f0eacac5a43 100755 |
--- a/net/tools/testserver/testserver.py |
+++ b/net/tools/testserver/testserver.py |
@@ -1594,7 +1594,7 @@ class TestPageHandler(testserver_base.BasePageHandler): |
import device_management |
policy_path = os.path.join(self.server.data_dir, 'device_management') |
self.server._device_management_handler = ( |
- device_management.TestServer(policy_path, self.server.policy_keys)) |
+ device_management.TestServer(policy_path)) |
http_response, raw_reply = ( |
self.server._device_management_handler.HandleRequest(self.path, |
@@ -1883,7 +1883,6 @@ class ServerRunner(testserver_base.TestServerRunner): |
server.file_root_url = self.options.file_root_url |
server_data['port'] = server.server_port |
server._device_management_handler = None |
- server.policy_keys = self.options.policy_keys |
elif self.options.server_type == SERVER_WEBSOCKET: |
# Launch pywebsocket via WebSocketServer. |
logger = logging.getLogger() |
@@ -2036,17 +2035,6 @@ class ServerRunner(testserver_base.TestServerRunner): |
'multiple algorithms should be enabled.'); |
self.option_parser.add_option('--file-root-url', default='/files/', |
help='Specify a root URL for files served.') |
- self.option_parser.add_option('--policy-key', action='append', |
- dest='policy_keys', |
- help='Specify a path to a PEM-encoded ' |
- 'private key to use for policy signing. May ' |
- 'be specified multiple times in order to ' |
- 'load multipe keys into the server. If the ' |
- 'server has multiple keys, it will rotate ' |
- 'through them in at each request a ' |
- 'round-robin fashion. The server will ' |
- 'generate a random key if none is specified ' |
- 'on the command line.') |
if __name__ == '__main__': |