Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove duplication of the CGI environment variables
authorStevenGBrown
Sun, 16 Jan 2011 19:12:54 +0800
changeset 13269 aa3f726a2bdb
parent 13268 fff12b3d953a
child 13270 1e0d631b843b
tests: remove duplication of the CGI environment variables
tests/cgienv file | annotate | diff | comparison | revisions
tests/test-clone-cgi.t file | annotate | diff | comparison | revisions
tests/test-newcgi.t file | annotate | diff | comparison | revisions
tests/test-newercgi.t file | annotate | diff | comparison | revisions
tests/test-oldcgi.t file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/cgienv	Sun Jan 16 19:12:54 2011 +0800
@@ -0,0 +1,29 @@
+DOCUMENT_ROOT="/var/www/hg"; export DOCUMENT_ROOT
+GATEWAY_INTERFACE="CGI/1.1"; export GATEWAY_INTERFACE
+HTTP_ACCEPT="text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; export HTTP_ACCEPT
+HTTP_ACCEPT_CHARSET="ISO-8859-1,utf-8;q=0.7,*;q=0.7"; export HTTP_ACCEPT_CHARSET
+HTTP_ACCEPT_ENCODING="gzip,deflate"; export HTTP_ACCEPT_ENCODING
+HTTP_ACCEPT_LANGUAGE="en-us,en;q=0.5"; export HTTP_ACCEPT_LANGUAGE
+HTTP_CACHE_CONTROL="max-age=0"; export HTTP_CACHE_CONTROL
+HTTP_CONNECTION="keep-alive"; export HTTP_CONNECTION
+HTTP_HOST="hg.omnifarious.org"; export HTTP_HOST
+HTTP_KEEP_ALIVE="300"; export HTTP_KEEP_ALIVE
+HTTP_USER_AGENT="Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/1.5.0.4"; export HTTP_USER_AGENT
+PATH_INFO="/"; export PATH_INFO
+PATH_TRANSLATED="/var/www/hg/index.html"; export PATH_TRANSLATED
+QUERY_STRING=""; export QUERY_STRING
+REMOTE_ADDR="127.0.0.2"; export REMOTE_ADDR
+REMOTE_PORT="44703"; export REMOTE_PORT
+REQUEST_METHOD="GET"; export REQUEST_METHOD
+REQUEST_URI="/test/"; export REQUEST_URI
+SCRIPT_FILENAME="/home/hopper/hg_public/test.cgi"; export SCRIPT_FILENAME
+SCRIPT_NAME="/test"; export SCRIPT_NAME
+SCRIPT_URI="http://hg.omnifarious.org/test/"; export SCRIPT_URI
+SCRIPT_URL="/test/"; export SCRIPT_URL
+SERVER_ADDR="127.0.0.1"; export SERVER_ADDR
+SERVER_ADMIN="eric@localhost"; export SERVER_ADMIN
+SERVER_NAME="hg.omnifarious.org"; export SERVER_NAME
+SERVER_PORT="80"; export SERVER_PORT
+SERVER_PROTOCOL="HTTP/1.1"; export SERVER_PROTOCOL
+SERVER_SIGNATURE="<address>Apache/2.0.53 (Fedora) Server at hg.omnifarious.org Port 80</address>"; export SERVER_SIGNATURE
+SERVER_SOFTWARE="Apache/2.0.53 (Fedora)"; export SERVER_SOFTWARE
--- a/tests/test-clone-cgi.t	Sun Jan 16 12:25:46 2011 +0100
+++ b/tests/test-clone-cgi.t	Sun Jan 16 19:12:54 2011 +0800
@@ -19,37 +19,10 @@
   > wsgicgi.launch(application)
   > HGWEB
   $ chmod 755 hgweb.cgi
-  $ DOCUMENT_ROOT="/var/www/hg"; export DOCUMENT_ROOT
-  $ GATEWAY_INTERFACE="CGI/1.1"; export GATEWAY_INTERFACE
-  $ HTTP_ACCEPT="text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; export HTTP_ACCEPT
-  $ HTTP_ACCEPT_CHARSET="ISO-8859-1,utf-8;q=0.7,*;q=0.7"; export HTTP_ACCEPT_CHARSET
-  $ HTTP_ACCEPT_ENCODING="gzip,deflate"; export HTTP_ACCEPT_ENCODING
-  $ HTTP_ACCEPT_LANGUAGE="en-us,en;q=0.5"; export HTTP_ACCEPT_LANGUAGE
-  $ HTTP_CACHE_CONTROL="max-age=0"; export HTTP_CACHE_CONTROL
-  $ HTTP_CONNECTION="keep-alive"; export HTTP_CONNECTION
-  $ HTTP_HOST="hg.omnifarious.org"; export HTTP_HOST
-  $ HTTP_KEEP_ALIVE="300"; export HTTP_KEEP_ALIVE
-  $ HTTP_USER_AGENT="Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/1.5.0.4"; export HTTP_USER_AGENT
-  $ PATH_INFO="/"; export PATH_INFO
-  $ PATH_TRANSLATED="/var/www/hg/index.html"; export PATH_TRANSLATED
-  $ REMOTE_ADDR="127.0.0.2"; export REMOTE_ADDR
-  $ REMOTE_PORT="44703"; export REMOTE_PORT
-  $ REQUEST_METHOD="GET"; export REQUEST_METHOD
-  $ REQUEST_URI="/test/"; export REQUEST_URI
-  $ SCRIPT_FILENAME="/home/hopper/hg_public/test.cgi"; export SCRIPT_FILENAME
-  $ SCRIPT_NAME="/test"; export SCRIPT_NAME
-  $ SCRIPT_URI="http://hg.omnifarious.org/test/"; export SCRIPT_URI
-  $ SCRIPT_URL="/test/"; export SCRIPT_URL
-  $ SERVER_ADDR="127.0.0.1"; export SERVER_ADDR
-  $ SERVER_ADMIN="eric@localhost"; export SERVER_ADMIN
-  $ SERVER_NAME="hg.omnifarious.org"; export SERVER_NAME
-  $ SERVER_PORT="80"; export SERVER_PORT
-  $ SERVER_PROTOCOL="HTTP/1.1"; export SERVER_PROTOCOL
-  $ SERVER_SIGNATURE="<address>Apache/2.0.53 (Fedora) Server at hg.omnifarious.org Port 80</address>"; export SERVER_SIGNATURE
-  $ SERVER_SOFTWARE="Apache/2.0.53 (Fedora)"; export SERVER_SOFTWARE
 
 try hgweb request
 
+  $ . "$TESTDIR/cgienv"
   $ QUERY_STRING="cmd=changegroup&roots=0000000000000000000000000000000000000000"; export QUERY_STRING
   $ python hgweb.cgi >page1 2>&1
   $ python "$TESTDIR/md5sum.py" page1
--- a/tests/test-newcgi.t	Sun Jan 16 12:25:46 2011 +0100
+++ b/tests/test-newcgi.t	Sun Jan 16 19:12:54 2011 +0800
@@ -49,36 +49,7 @@
 
   $ chmod 755 hgwebdir.cgi
 
-  $ DOCUMENT_ROOT="/var/www/hg"; export DOCUMENT_ROOT
-  $ GATEWAY_INTERFACE="CGI/1.1"; export GATEWAY_INTERFACE
-  $ HTTP_ACCEPT="text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; export HTTP_ACCEPT
-  $ HTTP_ACCEPT_CHARSET="ISO-8859-1,utf-8;q=0.7,*;q=0.7"; export HTTP_ACCEPT_CHARSET
-  $ HTTP_ACCEPT_ENCODING="gzip,deflate"; export HTTP_ACCEPT_ENCODING
-  $ HTTP_ACCEPT_LANGUAGE="en-us,en;q=0.5"; export HTTP_ACCEPT_LANGUAGE
-  $ HTTP_CACHE_CONTROL="max-age=0"; export HTTP_CACHE_CONTROL
-  $ HTTP_CONNECTION="keep-alive"; export HTTP_CONNECTION
-  $ HTTP_HOST="hg.omnifarious.org"; export HTTP_HOST
-  $ HTTP_KEEP_ALIVE="300"; export HTTP_KEEP_ALIVE
-  $ HTTP_USER_AGENT="Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/1.5.0.4"; export HTTP_USER_AGENT
-  $ PATH_INFO="/"; export PATH_INFO
-  $ PATH_TRANSLATED="/var/www/hg/index.html"; export PATH_TRANSLATED
-  $ QUERY_STRING=""; export QUERY_STRING
-  $ REMOTE_ADDR="127.0.0.2"; export REMOTE_ADDR
-  $ REMOTE_PORT="44703"; export REMOTE_PORT
-  $ REQUEST_METHOD="GET"; export REQUEST_METHOD
-  $ REQUEST_URI="/test/"; export REQUEST_URI
-  $ SCRIPT_FILENAME="/home/hopper/hg_public/test.cgi"; export SCRIPT_FILENAME
-  $ SCRIPT_NAME="/test"; export SCRIPT_NAME
-  $ SCRIPT_URI="http://hg.omnifarious.org/test/"; export SCRIPT_URI
-  $ SCRIPT_URL="/test/"; export SCRIPT_URL
-  $ SERVER_ADDR="127.0.0.1"; export SERVER_ADDR
-  $ SERVER_ADMIN="eric@localhost"; export SERVER_ADMIN
-  $ SERVER_NAME="hg.omnifarious.org"; export SERVER_NAME
-  $ SERVER_PORT="80"; export SERVER_PORT
-  $ SERVER_PROTOCOL="HTTP/1.1"; export SERVER_PROTOCOL
-  $ SERVER_SIGNATURE="<address>Apache/2.0.53 (Fedora) Server at hg.omnifarious.org Port 80</address>"; export SERVER_SIGNATURE
-  $ SERVER_SOFTWARE="Apache/2.0.53 (Fedora)"; export SERVER_SOFTWARE
-
+  $ . "$TESTDIR/cgienv"
   $ python hgweb.cgi > page1
   $ python hgwebdir.cgi > page2
 
--- a/tests/test-newercgi.t	Sun Jan 16 12:25:46 2011 +0100
+++ b/tests/test-newercgi.t	Sun Jan 16 19:12:54 2011 +0800
@@ -43,36 +43,7 @@
 
   $ chmod 755 hgwebdir.cgi
 
-  $ DOCUMENT_ROOT="/var/www/hg"; export DOCUMENT_ROOT
-  $ GATEWAY_INTERFACE="CGI/1.1"; export GATEWAY_INTERFACE
-  $ HTTP_ACCEPT="text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; export HTTP_ACCEPT
-  $ HTTP_ACCEPT_CHARSET="ISO-8859-1,utf-8;q=0.7,*;q=0.7"; export HTTP_ACCEPT_CHARSET
-  $ HTTP_ACCEPT_ENCODING="gzip,deflate"; export HTTP_ACCEPT_ENCODING
-  $ HTTP_ACCEPT_LANGUAGE="en-us,en;q=0.5"; export HTTP_ACCEPT_LANGUAGE
-  $ HTTP_CACHE_CONTROL="max-age=0"; export HTTP_CACHE_CONTROL
-  $ HTTP_CONNECTION="keep-alive"; export HTTP_CONNECTION
-  $ HTTP_HOST="hg.omnifarious.org"; export HTTP_HOST
-  $ HTTP_KEEP_ALIVE="300"; export HTTP_KEEP_ALIVE
-  $ HTTP_USER_AGENT="Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/1.5.0.4"; export HTTP_USER_AGENT
-  $ PATH_INFO="/"; export PATH_INFO
-  $ PATH_TRANSLATED="/var/www/hg/index.html"; export PATH_TRANSLATED
-  $ QUERY_STRING=""; export QUERY_STRING
-  $ REMOTE_ADDR="127.0.0.2"; export REMOTE_ADDR
-  $ REMOTE_PORT="44703"; export REMOTE_PORT
-  $ REQUEST_METHOD="GET"; export REQUEST_METHOD
-  $ REQUEST_URI="/test/"; export REQUEST_URI
-  $ SCRIPT_FILENAME="/home/hopper/hg_public/test.cgi"; export SCRIPT_FILENAME
-  $ SCRIPT_NAME="/test"; export SCRIPT_NAME
-  $ SCRIPT_URI="http://hg.omnifarious.org/test/"; export SCRIPT_URI
-  $ SCRIPT_URL="/test/"; export SCRIPT_URL
-  $ SERVER_ADDR="127.0.0.1"; export SERVER_ADDR
-  $ SERVER_ADMIN="eric@localhost"; export SERVER_ADMIN
-  $ SERVER_NAME="hg.omnifarious.org"; export SERVER_NAME
-  $ SERVER_PORT="80"; export SERVER_PORT
-  $ SERVER_PROTOCOL="HTTP/1.1"; export SERVER_PROTOCOL
-  $ SERVER_SIGNATURE="<address>Apache/2.0.53 (Fedora) Server at hg.omnifarious.org Port 80</address>"; export SERVER_SIGNATURE
-  $ SERVER_SOFTWARE="Apache/2.0.53 (Fedora)"; export SERVER_SOFTWARE
-
+  $ . "$TESTDIR/cgienv"
   $ python hgweb.cgi > page1
   $ python hgwebdir.cgi > page2
 
@@ -81,7 +52,6 @@
   $ REQUEST_URI="/test/test/"
   $ SCRIPT_URI="http://hg.omnifarious.org/test/test/"
   $ SCRIPT_URL="/test/test/"
-
   $ python hgwebdir.cgi > page3
 
   $ grep -i error page1 page2 page3
--- a/tests/test-oldcgi.t	Sun Jan 16 12:25:46 2011 +0100
+++ b/tests/test-oldcgi.t	Sun Jan 16 19:12:54 2011 +0800
@@ -59,36 +59,7 @@
 
   $ chmod 755 hgwebdir.cgi
 
-  $ DOCUMENT_ROOT="/var/www/hg"; export DOCUMENT_ROOT
-  $ GATEWAY_INTERFACE="CGI/1.1"; export GATEWAY_INTERFACE
-  $ HTTP_ACCEPT="text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; export HTTP_ACCEPT
-  $ HTTP_ACCEPT_CHARSET="ISO-8859-1,utf-8;q=0.7,*;q=0.7"; export HTTP_ACCEPT_CHARSET
-  $ HTTP_ACCEPT_ENCODING="gzip,deflate"; export HTTP_ACCEPT_ENCODING
-  $ HTTP_ACCEPT_LANGUAGE="en-us,en;q=0.5"; export HTTP_ACCEPT_LANGUAGE
-  $ HTTP_CACHE_CONTROL="max-age=0"; export HTTP_CACHE_CONTROL
-  $ HTTP_CONNECTION="keep-alive"; export HTTP_CONNECTION
-  $ HTTP_HOST="hg.omnifarious.org"; export HTTP_HOST
-  $ HTTP_KEEP_ALIVE="300"; export HTTP_KEEP_ALIVE
-  $ HTTP_USER_AGENT="Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/1.5.0.4"; export HTTP_USER_AGENT
-  $ PATH_INFO="/"; export PATH_INFO
-  $ PATH_TRANSLATED="/var/www/hg/index.html"; export PATH_TRANSLATED
-  $ QUERY_STRING=""; export QUERY_STRING
-  $ REMOTE_ADDR="127.0.0.2"; export REMOTE_ADDR
-  $ REMOTE_PORT="44703"; export REMOTE_PORT
-  $ REQUEST_METHOD="GET"; export REQUEST_METHOD
-  $ REQUEST_URI="/test/"; export REQUEST_URI
-  $ SCRIPT_FILENAME="/home/hopper/hg_public/test.cgi"; export SCRIPT_FILENAME
-  $ SCRIPT_NAME="/test"; export SCRIPT_NAME
-  $ SCRIPT_URI="http://hg.omnifarious.org/test/"; export SCRIPT_URI
-  $ SCRIPT_URL="/test/"; export SCRIPT_URL
-  $ SERVER_ADDR="127.0.0.1"; export SERVER_ADDR
-  $ SERVER_ADMIN="eric@localhost"; export SERVER_ADMIN
-  $ SERVER_NAME="hg.omnifarious.org"; export SERVER_NAME
-  $ SERVER_PORT="80"; export SERVER_PORT
-  $ SERVER_PROTOCOL="HTTP/1.1"; export SERVER_PROTOCOL
-  $ SERVER_SIGNATURE="<address>Apache/2.0.53 (Fedora) Server at hg.omnifarious.org Port 80</address>"; export SERVER_SIGNATURE
-  $ SERVER_SOFTWARE="Apache/2.0.53 (Fedora)"; export SERVER_SOFTWARE
-
+  $ . "$TESTDIR/cgienv"
   $ python hgweb.cgi > page1
   $ python hgwebdir.cgi > page2
mercurial