cgitb

https://bz.mercurial-scm.org/show_bug.cgi?id=6784

Gbp-Pq: Name cgitb.patch

diff --git a/tests/test-clone-cgi.t b/tests/test-clone-cgi.t
index dc35add790a4bfcb0d6cd44eca96908388504c59..037b005a01d1ef5724df02ec55fda9f7b5596366 100644 (file)
--- a/tests/test-clone-cgi.t
+++ b/tests/test-clone-cgi.t
@@ -12,8 +12,6 @@ initialize repository
   $ cat >hgweb.cgi <<HGWEB
   > #
   > # An example CGI script to use hgweb, edit as necessary
-  > import cgitb
-  > cgitb.enable()
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
@@ -26,7 +24,7 @@ try hgweb request
 
   $ . "$TESTDIR/cgienv"
   $ QUERY_STRING="cmd=changegroup&roots=0000000000000000000000000000000000000000"; export QUERY_STRING
-  $ "$PYTHON" hgweb.cgi >page1 2>&1
+  $ "$PYTHON" hgweb.cgi >page1
   $ "$PYTHON" "$TESTDIR/md5sum.py" page1
   1f424bb22ec05c3c6bc866b6e67efe43  page1
 

diff --git a/tests/test-newcgi.t b/tests/test-newcgi.t
index 8548387a35d5e68f286f0104d6e3402d2479c896..438fb0aa50b7d721d17c5a7106cd2947fe27547d 100644 (file)
--- a/tests/test-newcgi.t
+++ b/tests/test-newcgi.t
@@ -9,9 +9,6 @@ before d74fc8dec2b4 still work.
   > #
   > # An example CGI script to use hgweb, edit as necessary
   > 
-  > import cgitb
-  > cgitb.enable()
-  > 
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
@@ -35,9 +32,6 @@ before d74fc8dec2b4 still work.
   > #
   > # An example CGI script to export multiple hgweb repos, edit as necessary
   > 
-  > import cgitb
-  > cgitb.enable()
-  > 
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgwebdir
   > from mercurial.hgweb import wsgicgi

diff --git a/tests/test-newercgi.t b/tests/test-newercgi.t
index 67592afbb001d8ce80e2fbdfcf8c47c84dd384ea..5bc0a2d22361bb4a5fb38b201d09c5e326bd47dc 100644 (file)
--- a/tests/test-newercgi.t
+++ b/tests/test-newercgi.t
@@ -9,9 +9,6 @@ This is a rudimentary test of the CGI files as of d74fc8dec2b4.
   > #
   > # An example CGI script to use hgweb, edit as necessary
   > 
-  > import cgitb
-  > cgitb.enable()
-  > 
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
@@ -32,9 +29,6 @@ This is a rudimentary test of the CGI files as of d74fc8dec2b4.
   > #
   > # An example CGI script to export multiple hgweb repos, edit as necessary
   > 
-  > import cgitb
-  > cgitb.enable()
-  > 
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgwebdir
   > from mercurial.hgweb import wsgicgi

diff --git a/tests/test-oldcgi.t b/tests/test-oldcgi.t
index b393e1a87e88ed85ba33290d890b5ea668bc7de7..e4acf2a8942f9d861428754ae222fe4ca09e2828 100644 (file)
--- a/tests/test-oldcgi.t
+++ b/tests/test-oldcgi.t
@@ -8,9 +8,6 @@ This tests if CGI files from before d0db3462d568 still work.
   > #
   > # An example CGI script to use hgweb, edit as necessary
   > 
-  > import cgitb, os, sys
-  > cgitb.enable()
-  > 
   > # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install
   > from mercurial import hgweb
   > 
@@ -30,9 +27,6 @@ This tests if CGI files from before d0db3462d568 still work.
   > #
   > # An example CGI script to export multiple hgweb repos, edit as necessary
   > 
-  > import cgitb, sys
-  > cgitb.enable()
-  > 
   > # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install
   > from mercurial import hgweb
   > 

diff --git a/tests/test-push-cgi.t b/tests/test-push-cgi.t
index 8c45ab4318d1e62e8fa6740ef25a7868675cc127..185d4a8f3273270e79395b80eccbb8891cfb43ba 100644 (file)
--- a/tests/test-push-cgi.t
+++ b/tests/test-push-cgi.t
@@ -16,8 +16,6 @@ initialize repository
 create hgweb invocation script
 
   $ cat >hgweb.cgi <<HGWEB
-  > import cgitb
-  > cgitb.enable()
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi