Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: run_tests.py

Issue 4895499043733504: Issue 510 - [Typed objects] Don`t hardcode script load order in unit tests (Closed)
Patch Set: Reverted to original get_scripts implementation Created Feb. 4, 2015, 3:33 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | test/common.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # coding: utf-8 2 # coding: utf-8
3 3
4 # This file is part of Adblock Plus <https://adblockplus.org/>, 4 # This file is part of Adblock Plus <https://adblockplus.org/>,
5 # Copyright (C) 2006-2015 Eyeo GmbH 5 # Copyright (C) 2006-2015 Eyeo GmbH
6 # 6 #
7 # Adblock Plus is free software: you can redistribute it and/or modify 7 # Adblock Plus is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License version 3 as 8 # it under the terms of the GNU General Public License version 3 as
9 # published by the Free Software Foundation. 9 # published by the Free Software Foundation.
10 # 10 #
11 # Adblock Plus is distributed in the hope that it will be useful, 11 # Adblock Plus is distributed in the hope that it will be useful,
12 # but WITHOUT ANY WARRANTY; without even the implied warranty of 12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 # GNU General Public License for more details. 14 # GNU General Public License for more details.
15 # 15 #
16 # You should have received a copy of the GNU General Public License 16 # You should have received a copy of the GNU General Public License
17 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 17 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
18 18
19 import io
20 import json
21 import os
22 import posixpath
23 import re
24 import urlparse
25
19 import flask 26 import flask
20 import os
21 import re
22 from urlparse import urlparse
23 27
24 app = flask.Flask(__name__) 28 app = flask.Flask(__name__)
25 29
30 def get_scripts(dir, reldir=""):
31 for filename in os.listdir(dir):
32 path = os.path.join(dir, filename)
33 relpath = posixpath.join(reldir, filename)
34 if os.path.isdir(path):
35 for path, relpath in get_scripts(path, relpath):
36 yield path, relpath
37 elif os.path.splitext(path)[1] == ".js":
38 yield path, relpath
39
26 def js_encode(str): 40 def js_encode(str):
27 return re.sub(r"(['\\])", r"\\\1", str) 41 return json.dumps(str)
42
43 def script_as_string(path, sourceURL, backcompat):
44 if backcompat:
45 from jshydra.abp_rewrite import doRewrite
46 data = doRewrite([os.path.abspath(path)], []).decode("utf-8")
47 else:
48 with io.open(path, "r", encoding="utf-8") as handle:
49 data = handle.read()
50 data += "\n//# sourceURL=%s" % sourceURL
51 return js_encode(data)
28 52
29 @app.route("/<path:path>", methods = ["GET"]) 53 @app.route("/<path:path>", methods = ["GET"])
30 @app.route("/", methods = ["GET"]) 54 @app.route("/", methods = ["GET"])
31 def multiplex(path=""): 55 def multiplex(path=""):
32 request_url = urlparse(flask.request.url) 56 request_url = urlparse.urlparse(flask.request.url)
33 request_path = request_url.path 57 request_path = request_url.path
34 islib = request_path.startswith("/lib/") 58 islib = request_path.startswith("/lib/")
35 backcompat = request_url.query == "backcompat" 59 backcompat = request_url.query == "backcompat"
36 60
37 rootdir = os.path.dirname(__file__) 61 rootdir = os.path.dirname(__file__)
38 if not islib: 62 if request_path == "/lib.js":
39 rootdir = os.path.join("test") 63 data = ""
40 64 for path, relpath in get_scripts(os.path.join(rootdir, "lib")):
41 if islib or backcompat: 65 url = urlparse.urljoin(flask.request.url, "/lib/" + relpath)
42 path = flask.safe_join(rootdir, request_path.lstrip("/")) 66 data += "require.sources[%s] = %s;\n" % (
43 if not os.path.isfile(path): 67 js_encode(os.path.splitext(relpath)[0]),
44 return flask.abort(404) 68 script_as_string(path, url, backcompat)
45 69 )
46 module = os.path.splitext(request_path[len("/lib/"):])[0] 70 return (data, 200, {"Content-Type": "application/javascript; charset=utf-8"} )
47 if backcompat: 71 elif request_path == "/tests.js":
48 from jshydra.abp_rewrite import doRewrite 72 data = "var tests = ["
49 data = doRewrite([os.path.abspath(path)], ["module=true"] if islib else [] ) 73 for path, relpath in get_scripts(os.path.join(rootdir, "test", "tests")):
50 data = re.sub(r"require\.scopes\[.*?\]", "require.scopes['%s']" % module, data) 74 url = urlparse.urljoin(flask.request.url, "/tests/" + relpath)
51 else: 75 data += " %s,\n" % script_as_string(path, url, backcompat)
52 with open(path, "rb") as file: 76 data += "];"
53 data = "require.scopes['%s'] = function(){var exports={};%s\nreturn expo rts;}();" % (module, file.read())
54 return (data, 200, {"Content-Type": "application/javascript; charset=utf-8"} ) 77 return (data, 200, {"Content-Type": "application/javascript; charset=utf-8"} )
55 else: 78 else:
79 if request_path.startswith("/lib/"):
80 rootdir = os.path.join(rootdir, "lib")
81 else:
82 rootdir = os.path.join(rootdir, "test")
56 if request_path.endswith("/"): 83 if request_path.endswith("/"):
57 request_path += "index.html" 84 request_path += "index.html"
58 return flask.send_from_directory(rootdir, request_path.lstrip("/")) 85 return flask.send_from_directory(rootdir, request_path.lstrip("/"))
59 86
60 if __name__ == "__main__": 87 if __name__ == "__main__":
61 app.run(debug=True) 88 app.run(debug=True)
OLDNEW
« no previous file with comments | « no previous file | test/common.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld