Home Explore Help
Sign In
compsci-industry
/
TechEmpower.FrameworkBenchmarks
mirror of https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

added Content-Length header to tests, passing locally

Keith Newman 10 years ago
parent
dfe0fb428a
commit
1374704670
8 changed files with 31 additions and 34 deletions
Unified View Show Diff Stats
  1. 2 2
      frameworks/Python/historical/install.sh
  2. 0 5
      frameworks/Python/historical/webware/app/Context/__init__.py
  3. 3 1
      frameworks/Python/historical/webware/app/Context/db.py
  4. 13 21
      frameworks/Python/historical/webware/app/Context/fortune.py
  5. 4 2
      frameworks/Python/historical/webware/app/Context/json2.py
  6. 3 1
      frameworks/Python/historical/webware/app/Context/plaintext.py
  7. 3 1
      frameworks/Python/historical/webware/app/Context/queries.py
  8. 3 1
      frameworks/Python/historical/webware/app/Context/updates.py

+ 2 - 2
frameworks/Python/historical/install.sh
View File 

@@ -8,11 +8,11 @@ export PIP_DOWNLOAD_CACHE=$IROOT/.pip_cache
 
 
 
 fw_depends python2 apache
 
 fw_depends python2 apache
 
 
 
+$PY2_PIP install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/webware/requirements.txt
 
+
 
 cd $TROOT/webware 
 cd $TROOT/webware 
 rm -fr Webware Webware-1.1.1
 
 rm -fr Webware Webware-1.1.1
 
 rm Webware-1.1.1.tar.gz
 
 rm Webware-1.1.1.tar.gz
 
 wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
 
 wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
 
 tar -xf Webware-1.1.1.tar.gz
 
 tar -xf Webware-1.1.1.tar.gz
 
 cp -r app/ Webware-1.1.1/
 
 cp -r app/ Webware-1.1.1/
 
-#rm -fr Webware-1.1.1/WebKit/Configs
 
-#cp -r app/Configs/ Webware-1.1.1/WebKit/Configs/

+ 0 - 5
frameworks/Python/historical/webware/app/Context/__init__.py
View File 

@@ -1,5 +0,0 @@
 
-
 
-def contextInitialize(appServer, path):
 
-    # You could put initialization code here to be executed
 
-    # when the context is loaded into WebKit.
 
-    pass

+ 3 - 1
frameworks/Python/historical/webware/app/Context/db.py
View File 

@@ -11,4 +11,6 @@ class db(HTTPContent):
 
         self.response()._headers["Content-Type"] = "application/json"
 
         self.response()._headers["Content-Type"] = "application/json"
 
         wid = randint(1, 10000)
 
         wid = randint(1, 10000)
 
         world = Database.DbSession.query(World).get(wid).serialize()
 
         world = Database.DbSession.query(World).get(wid).serialize()
 
-        self.write(json.dumps(world))
 
+        output = json.dumps(world)
 
+        self.response()._headers["Content-Length"] = len(output)
 
+        self.write(output)

+ 13 - 21
frameworks/Python/historical/webware/app/Context/fortune.py
View File 

@@ -8,24 +8,16 @@ from DbSession import Database
 
 from Fortune import Fortune
 
 from Fortune import Fortune
 
 
 
 class fortune(Page):
 
 class fortune(Page):
 
-    def writeDocType(self):
 
-        self.writeln("<!DOCTYPE html>")
 
-
 
-    def title(self):
 
-        return "Fortunes"
 
-
 
-    def htBodyArgs(self):
 
-        return ""
 
-
 
-    def writeContent(self):
 
-        self.response().clearHeaders()
 
-        self.response()._headers["Content-Type"] = "text/html; charset=UTF-8"
 
-        fortunes = Database.DbSession.query(Fortune).all()
 
-        fortunes.append(Fortune(id=0, message="Additional fortune added at request time."))
 
-        fortunes.sort(key=attrgetter("message"))
 
-		
-        self.writeln("<table><tr><th>id</th><th>message</th></tr>")
 
-        for fortune in fortunes:
 
-            message = bleach.clean(fortune.message)
 
-            self.writeln("<tr><td>%s</td><td>%s</td></tr>" % (fortune.id , message.encode("utf-8")))
 
-        self.writeln("</table>")
 
+	def writeHTML(self):
 
+		output = "<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>"
 
+		self.response().clearHeaders()
 
+		self.response()._headers["Content-Type"] = "text/html; charset=UTF-8"
 
+		fortunes = Database.DbSession.query(Fortune).all()
 
+		fortunes.append(Fortune(id=0, message="Additional fortune added at request time."))
 
+		fortunes.sort(key=attrgetter("message"))
 
+		for fortune in fortunes:
 
+			message = bleach.clean(fortune.message)
 
+			output += "<tr><td>%s</td><td>%s</td></tr>" % (fortune.id , message.encode("utf-8"))
 
+		output += "</table></body></html>"
 
+		self.response()._headers["Content-Length"] = len(output)
 
+		self.writeln(output)

+ 4 - 2
frameworks/Python/historical/webware/app/Context/json2.py
View File 

@@ -5,5 +5,7 @@ import json
 
 class json2(HTTPContent):
 
 class json2(HTTPContent):
 
     def defaultAction(self):
 
     def defaultAction(self):
 
         self.response().clearHeaders()
 
         self.response().clearHeaders()
 
-        self.response()._headers["Content-Type"] = "application/json"		
-        self.write(json.dumps({"message": "Hello, World!"}))
 
+        self.response()._headers["Content-Type"] = "application/json"
 
+        output = json.dumps({"message": "Hello, World!"})		
+        self.response()._headers["Content-Length"] = len(output)		
+        self.write(output)

+ 3 - 1
frameworks/Python/historical/webware/app/Context/plaintext.py
View File 

@@ -5,4 +5,6 @@ class plaintext(HTTPContent):
 
     def defaultAction(self):
 
     def defaultAction(self):
 
     	self.response().clearHeaders()
 
     	self.response().clearHeaders()
 
         self.response()._headers["Content-Type"] = "text/plain"
 
         self.response()._headers["Content-Type"] = "text/plain"
 
-        self.write("Hello, World!")
 
+        output = "Hello, World!"
 
+        self.response()._headers["Content-Length"] = len(output)
 
+        self.write(output)

+ 3 - 1
frameworks/Python/historical/webware/app/Context/queries.py
View File 

@@ -15,4 +15,6 @@ class queries(HTTPContent):
 
         rp = partial(randint, 1, 10000)
 
         rp = partial(randint, 1, 10000)
 
         get = Database.DbSession.query(World).get
 
         get = Database.DbSession.query(World).get
 
         worlds = [get(rp()).serialize() for _ in xrange(num_queries)]
 
         worlds = [get(rp()).serialize() for _ in xrange(num_queries)]
 
-        self.write(json.dumps(worlds))
 
+        output = json.dumps(worlds)
 
+        self.response()._headers["Content-Length"] = len(output)
 
+        self.write(output)

+ 3 - 1
frameworks/Python/historical/webware/app/Context/updates.py
View File 

@@ -21,4 +21,6 @@ class updates(HTTPContent):
 
             world.randomNumber = rp()
 
             world.randomNumber = rp()
 
             worlds.append(world.serialize())
 
             worlds.append(world.serialize())
 
         Database.DbSession.commit()
 
         Database.DbSession.commit()
 
-        self.write(json.dumps(worlds))
 
+        output = json.dumps(worlds)
 
+        self.response()._headers["Content-Length"] = len(output)
 
+        self.write(output)