Add a serve command to the wpt frontend

README.md

@@ -47,7 +47,7 @@ Running Tests Manually
 
 The test server can be started using
 
- ./serve
+ ./wpt serve
 
 This will start HTTP servers on two ports and a websockets server on
 one port. By default one web server starts on port 8000 and the other
@@ -121,6 +121,7 @@ The `wpt` command provides a frontend to a variety of tools for
 working with and running web-platform-tests. Some of the most useful
 commands are:
 
+* `wpt serve` - For starting the wpt http server
 * `wpt run` - For running tests in a browser
 * `wpt lint` - For running the lint against all tests
 * `wpt manifest` - For updating or generating a `MANIFEST.json` test manifest

ci_unittest.sh

@@ -13,8 +13,8 @@ if [ $TOXENV == "py27" ] || [ $TOXENV == "pypy" ]; then
 
  cd $ROOT
  pip install --requirement tools/browserutils/requirements.txt
- wpt install firefox browser --destination $HOME
- wpt install firefox webdriver --destination $HOME/firefox
+ ./wpt install firefox browser --destination $HOME
+ ./wpt install firefox webdriver --destination $HOME/firefox
  export PATH=$HOME/firefox:$PATH
 
  cd $ROOT/resources/test

tools/serve/commands.json

@@ -0,0 +1,2 @@
+{"serve": {"path": "serve.py", "script": "run", "parser": "get_parser", "help": "Run wptserve server",
+ "virtualenv": false}}

tools/serve/serve.py

@@ -762,8 +762,7 @@ def get_parser():
  return parser
 
 
-def main():
- kwargs = vars(get_parser().parse_args())
+def run(**kwargs):
  config = load_config("config.default.json",
  "config.json",
  **kwargs)
@@ -784,3 +783,8 @@ def main():
  item.join(1)
  except KeyboardInterrupt:
  logger.info("Shutting down")
+
+
+def main():
+ kwargs = vars(get_parser().parse_args())
+ return run(**kwargs)

tools/wpt/paths

@@ -1,4 +1,5 @@
-tools/wpt/
 tools/browserutils/
 tools/lint/
 tools/manifest/
+tools/serve/
+tools/wpt/