[wwwsearch-commits] r43928 - in wwwsearch/mechanize/trunk: . test-tools

Thu May 31 01:13:21 CEST 2007

Author: jjlee
Date: Thu May 31 01:13:20 2007
New Revision: 43928

Modified:
   wwwsearch/mechanize/trunk/functional_tests.py
   wwwsearch/mechanize/trunk/test-tools/twisted-localserver.py
Log:
Get rid of the remaining hard-coded URLs in functional tests :-)

Modified: wwwsearch/mechanize/trunk/functional_tests.py
==============================================================================

--- wwwsearch/mechanize/trunk/functional_tests.py	(original)
+++ wwwsearch/mechanize/trunk/functional_tests.py	Thu May 31 01:13:20 2007
@@ -256,8 +256,8 @@
 
     def test_referer(self):
         br = mechanize.Browser()
-        referer = "http://wwwsearch.sourceforge.net/bits/referertest.html"
-        info = "http://wwwsearch.sourceforge.net/cgi-bin/cookietest.cgi"
+        referer = urljoin(self.uri, "bits/referertest.html")
+        info = urljoin(self.uri, "/cgi-bin/cookietest.cgi")
 
         r = br.open(info)
         self.assert_(referer not in r.get_data())
@@ -286,8 +286,7 @@
         try:
             install_opener(o)
             try:
-                r = urlopen(
-                    "http://wwwsearch.sourceforge.net/cgi-bin/cookietest.cgi")
+                r = urlopen(urljoin(self.uri, "/cgi-bin/cookietest.cgi"))
             except urllib2.URLError, e:
                 #print e.read()
                 raise
@@ -317,7 +316,7 @@
                 opener.open, urljoin(self.uri, "norobots"))
 
     def test_urlretrieve(self):
-        url = "http://www.python.org/"
+        url = urljoin(self.uri, "/mechanize/")
         test_filename = "python.html"
         def check_retrieve(opener, filename, headers):
             self.assertEqual(headers.get('Content-Type'), 'text/html')

Modified: wwwsearch/mechanize/trunk/test-tools/twisted-localserver.py
==============================================================================
--- wwwsearch/mechanize/trunk/test-tools/twisted-localserver.py	(original)
+++ wwwsearch/mechanize/trunk/test-tools/twisted-localserver.py	Thu May 31 01:13:20 2007
@@ -16,7 +16,7 @@
 
 import os, sys, re, time
 from twisted.web2 import server, http, resource, channel, \
-     static, http_headers, responsecode
+     static, http_headers, responsecode, twcgi
 
 from twisted.internet import reactor
 
@@ -47,6 +47,16 @@
 </body>
 
 </html>""" % (("0123456789ABCDEF"*4+"\n")*61)
+REFERER_TEST_HTML = """\
+<html>
+<head>
+<title>mechanize Referer (sic) test page</title>
+</head>
+<body>
+<p>This page exists to test the Referer functionality of <a href="/mechanize">mechanize</a>.
+<p><a href="/cgi-bin/cookietest.cgi">Here</a> is a link to a page that displays the Referer header.
+</body>
+</html>"""
 
 
 class Page(resource.Resource):
@@ -84,6 +94,11 @@
     setattr(root, "child_"+name, redirect)
     return redirect
 
+def make_cgi_bin(parent, name, dir_name):
+    cgi_bin = twcgi.CGIDirectory(dir_name)
+    setattr(parent, "child_"+name, cgi_bin)
+    return cgi_bin
+
 def main():
     root = Page()
     root.text = ROOT_HTML
@@ -97,8 +112,10 @@
     make_leaf_page(bits, "cctest2.txt",
                    "Hello ClientCookie functional test suite.",
                    "text/plain")
+    make_leaf_page(bits, "referertest.html", REFERER_TEST_HTML)
     make_leaf_page(bits, "mechanize_reload_test.html", RELOAD_TEST_HTML)
     make_redirect(root, "redirected", "/doesnotexist")
+    make_cgi_bin(root, "cgi-bin", "examples")
 
     site = server.Site(root)
     reactor.listenTCP(int(sys.argv[1]), channel.HTTPFactory(site))
