| Fix python test suite for GnuTLS 3.5.12+ |
| |
| Backport of f42229b1fdf30ee30c6e13b01eb0c4ebd9ea9169 |
| |
| --- a/testenv/Test--rejected-log.py |
| +++ b/testenv/Test--rejected-log.py |
| @@ -14,7 +14,7 @@ mainpage = """ |
| </head> |
| <body> |
| <p> |
| - Recurse to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>. |
| + Recurse to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>. |
| </p> |
| </body> |
| </html> |
| @@ -27,8 +27,8 @@ secondpage = """ |
| </head> |
| <body> |
| <p> |
| - Recurse to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>. |
| - Try the blacklisted <a href="http://127.0.0.1:{{port}}/index.html">main page</a>. |
| + Recurse to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>. |
| + Try the blacklisted <a href="http://localhost:{{port}}/index.html">main page</a>. |
| </p> |
| </body> |
| </html> |
| @@ -41,7 +41,7 @@ thirdpage = """ |
| </head> |
| <body> |
| <p> |
| - Try a hidden <a href="http://127.0.0.1:{{port}}/dummy.txt">dummy file</a>. |
| + Try a hidden <a href="http://localhost:{{port}}/dummy.txt">dummy file</a>. |
| Try to leave to <a href="http://no.such.domain/">another domain</a>. |
| </p> |
| </body> |
| @@ -55,9 +55,9 @@ Disallow: /dummy.txt |
| |
| log = """\ |
| REASON\tU_URL\tU_SCHEME\tU_HOST\tU_PORT\tU_PATH\tU_PARAMS\tU_QUERY\tU_FRAGMENT\tP_URL\tP_SCHEME\tP_HOST\tP_PORT\tP_PATH\tP_PARAMS\tP_QUERY\tP_FRAGMENT |
| -BLACKLIST\thttp%3A//127.0.0.1%3A{{port}}/index.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tindex.html\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/secondpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tsecondpage.html\t\t\t |
| -ROBOTS\thttp%3A//127.0.0.1%3A{{port}}/dummy.txt\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tdummy.txt\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t |
| -SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t |
| +BLACKLIST\thttp%3A//localhost%3A{{port}}/index.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tindex.html\t\t\t\thttp%3A//localhost%3A{{port}}/secondpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tsecondpage.html\t\t\t |
| +ROBOTS\thttp%3A//localhost%3A{{port}}/dummy.txt\tSCHEME_HTTP\tlocalhost\t{{port}}\tdummy.txt\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t |
| +SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t |
| """ |
| |
| dummyfile = "Don't care." |
| --- a/testenv/Test--spider-r.py |
| +++ b/testenv/Test--spider-r.py |
| @@ -14,8 +14,8 @@ mainpage = """ |
| </head> |
| <body> |
| <p> |
| - Some text and a link to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>. |
| - Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>. |
| + Some text and a link to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>. |
| + Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>. |
| </p> |
| </body> |
| </html> |
| @@ -29,8 +29,8 @@ secondpage = """ |
| </head> |
| <body> |
| <p> |
| - Some text and a link to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>. |
| - Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>. |
| + Some text and a link to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>. |
| + Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>. |
| </p> |
| </body> |
| </html> |
| @@ -43,8 +43,8 @@ thirdpage = """ |
| </head> |
| <body> |
| <p> |
| - Some text and a link to a <a href="http://127.0.0.1:{{port}}/dummy.txt">text file</a>. |
| - Also, another <a href="http://127.0.0.1:{{port}}/againnonexistent">broken link</a>. |
| + Some text and a link to a <a href="http://localhost:{{port}}/dummy.txt">text file</a>. |
| + Also, another <a href="http://localhost:{{port}}/againnonexistent">broken link</a>. |
| </p> |
| </body> |
| </html> |
| --- a/testenv/certs/server-cert.pem |
| +++ b/testenv/certs/server-cert.pem |
| @@ -1,21 +1,21 @@ |
| -----BEGIN CERTIFICATE----- |
| -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 |
| +e5wnYQIS4MzowvDx8WevTPMRKlN72d8HHuv9 |
| -----END CERTIFICATE----- |
| --- a/testenv/certs/server-crl.pem |
| +++ b/testenv/certs/server-crl.pem |
| @@ -1,12 +1,12 @@ |
| -----BEGIN X509 CRL----- |
| -MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN |
| -MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VGA8yMDE0MTExMTE2NDU1NFoYDzk5 |
| -OTkxMjMxMjM1OTU5WjAdMBsCCFRiO986yHnjGA8yMDE0MTExMTE2NDU1NFqgNjA0 |
| -MB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tUMBEGA1UdFAQKAghUYj1E |
| -KHs9ijANBgkqhkiG9w0BAQsFAAOCAQEAZgwqs1VOFG39dFHHMXvBr4eJfhwiG4bC |
| -cL6IvLhvl9ikcyQMHrpOBtNjkCtgclSbJjjTDdera1+zuCWE0WBOJ4mojYdAIOhR |
| -QvSwp4NwAtibu2F/fjeXoo+LEpcRKtLvAotB30eCZ1OPrijsa/HxFILOLlayjns8 |
| -wM4RmQC4o43y1G/1jqM8hGDg4Wz0j1URVuyP+pU55JpubV5LlExy3gIRwevD2lam |
| -q3hiighenJYFO3HGZkYT2SIoSpXZnQqKPJ4HwRBSg/cjOpc1y1lIIvKhmk+Cut6M |
| -+S5HL4pIk8vGYg57nTfOOkj1goqFkfU0DBqvVAZj02ay/VIDu61T1g== |
| +MIIB1jCBvwIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN |
| +MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VFw0xNzA3MDgxNTA3MDRaFw0xODA3 |
| +MDgxNTA3MDRaMB8wHQIMWWD1GB1UFkEICdQvFw0xNzA3MDgxNTA3MDRaoDowODAf |
| +BgNVHSMEGDAWgBTzPk44hEqpvsFvx2GjUNpuKYvrVDAVBgNVHRQEDgIMWWD1GB4C |
| +YfERSnyEMA0GCSqGSIb3DQEBCwUAA4IBAQAAKu+Lum1l/XtcCJ43WveouPK97iOE |
| +bjUZWaGYx8Ys/iBdhTa1GXG+E+JuyqgyHTW0HrWJi1D+GiYmsjPJXoEgVgtxXEQ7 |
| +8b3NyIQ8OCsSTTlVCmLECN9R0xlsitzH+HXOaIEs5sbmIxCnxu+brqno9gQocmCv |
| +LHYvoSxsSsOCkkmodbYtKssl2dBonvQPSijN/z3NhZ259e2U3Yv4V7/MrEoTvOxg |
| +M0GC0u0Nx86EWbq0sWeiUu270Qk9En5YGNtRhkeq0bXerJswmMAmvrtuKdyfouny |
| +4WMvtn30xsO3WwWSV2oyrDSN/IQdDbcmul/bg8ewqlnN77cVf2m70c/W |
| -----END X509 CRL----- |
| --- a/testenv/certs/server-template.cfg |
| +++ b/testenv/certs/server-template.cfg |
| @@ -68,7 +68,6 @@ expiration_days = -1 |
| # X.509 v3 extensions |
| |
| # A dnsname in case of a WWW server. |
| -dns_name = "127.0.0.1" |
| dns_name = "localhost" |
| |
| # A subject alternative name URI |
| --- a/testenv/test/base_test.py |
| +++ b/testenv/test/base_test.py |
| @@ -90,7 +90,7 @@ class BaseTest: |
| # ports and etc. |
| # so we should record different domains respect to servers. |
| domain = self.get_domain_addr(instance.server_address) |
| - self.domains.append(domain[0]) |
| + self.domains.append('localhost') |
| self.ports.append(domain[1]) |
| |
| def exec_wget(self): |
