changeset 12181:045c9e8db0d8

tests: fix test output for test-hgweb-no* tests
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 08 Sep 2010 15:19:35 +0200
parents 45e654e10e1b
children 1121af239761
files tests/test-hgweb-no-path-info tests/test-hgweb-no-path-info.out tests/test-hgweb-no-request-uri tests/test-hgweb-no-request-uri.out tests/test-hgweb-non-interactive tests/test-hgweb-non-interactive.out
diffstat 6 files changed, 30 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-hgweb-no-path-info	Wed Sep 08 15:18:33 2010 +0200
+++ b/tests/test-hgweb-no-path-info	Wed Sep 08 15:19:35 2010 +0200
@@ -19,11 +19,12 @@
 errors = StringIO()
 input = StringIO()
 
-def startrsp(headers, data):
+def startrsp(status, headers):
+	print '---- STATUS'
+	print status
 	print '---- HEADERS'
 	print headers
 	print '---- DATA'
-	print data
 	return output.write
 
 env = {
--- a/tests/test-hgweb-no-path-info.out	Wed Sep 08 15:18:33 2010 +0200
+++ b/tests/test-hgweb-no-path-info.out	Wed Sep 08 15:19:35 2010 +0200
@@ -4,10 +4,11 @@
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     test
 
----- HEADERS
+---- STATUS
 200 Script output follows
+---- HEADERS
+[('Content-Type', 'application/atom+xml; charset=ascii')]
 ---- DATA
-[('Content-Type', 'application/atom+xml; charset=ascii')]
 <?xml version="1.0" encoding="ascii"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
  <!-- Changelog -->
@@ -37,10 +38,11 @@
 </feed>
 ---- ERRORS
 
----- HEADERS
+---- STATUS
 200 Script output follows
+---- HEADERS
+[('Content-Type', 'text/plain; charset=ascii')]
 ---- DATA
-[('Content-Type', 'text/plain; charset=ascii')]
 
 repo/
 
--- a/tests/test-hgweb-no-request-uri	Wed Sep 08 15:18:33 2010 +0200
+++ b/tests/test-hgweb-no-request-uri	Wed Sep 08 15:19:35 2010 +0200
@@ -19,11 +19,12 @@
 errors = StringIO()
 input = StringIO()
 
-def startrsp(headers, data):
+def startrsp(status, headers):
+	print '---- STATUS'
+	print status
 	print '---- HEADERS'
 	print headers
 	print '---- DATA'
-	print data
 	return output.write
 
 env = {
--- a/tests/test-hgweb-no-request-uri.out	Wed Sep 08 15:18:33 2010 +0200
+++ b/tests/test-hgweb-no-request-uri.out	Wed Sep 08 15:19:35 2010 +0200
@@ -4,10 +4,11 @@
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     test
 
----- HEADERS
+---- STATUS
 200 Script output follows
+---- HEADERS
+[('Content-Type', 'application/atom+xml; charset=ascii')]
 ---- DATA
-[('Content-Type', 'application/atom+xml; charset=ascii')]
 <?xml version="1.0" encoding="ascii"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
  <!-- Changelog -->
@@ -37,29 +38,32 @@
 </feed>
 ---- ERRORS
 
----- HEADERS
+---- STATUS
 200 Script output follows
+---- HEADERS
+[('Content-Type', 'text/plain; charset=ascii')]
 ---- DATA
-[('Content-Type', 'text/plain; charset=ascii')]
 
 -rw-r--r-- 4 bar
 
 
 ---- ERRORS
 
----- HEADERS
+---- STATUS
 200 Script output follows
+---- HEADERS
+[('Content-Type', 'text/plain; charset=ascii')]
 ---- DATA
-[('Content-Type', 'text/plain; charset=ascii')]
 
 /repo/
 
 ---- ERRORS
 
----- HEADERS
+---- STATUS
 200 Script output follows
+---- HEADERS
+[('Content-Type', 'text/plain; charset=ascii')]
 ---- DATA
-[('Content-Type', 'text/plain; charset=ascii')]
 
 -rw-r--r-- 4 bar
 
--- a/tests/test-hgweb-non-interactive	Wed Sep 08 15:18:33 2010 +0200
+++ b/tests/test-hgweb-non-interactive	Wed Sep 08 15:19:35 2010 +0200
@@ -36,11 +36,12 @@
 input = StringIO()
 output = StringIO()
 
-def startrsp(headers, data):
+def startrsp(status, headers):
+	print '---- STATUS'
+	print status
 	print '---- HEADERS'
 	print headers
 	print '---- DATA'
-	print data
 	return output.write
 
 env = {
--- a/tests/test-hgweb-non-interactive.out	Wed Sep 08 15:18:33 2010 +0200
+++ b/tests/test-hgweb-non-interactive.out	Wed Sep 08 15:19:35 2010 +0200
@@ -4,10 +4,11 @@
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     test
 
----- HEADERS
+---- STATUS
 200 Script output follows
+---- HEADERS
+[('Content-Type', 'text/html; charset=ascii')]
 ---- DATA
-[('Content-Type', 'text/html; charset=ascii')]
 ---- ERRORS
 
 ---- OS.ENVIRON wsgi variables