Ticket #6499: fix-ci-errors.patch

File fix-ci-errors.patch, 1.5 KB (added by Hynek Schlawack, 8 years ago)
  • twisted/internet/endpoints.py

    diff --git twisted/internet/endpoints.py twisted/internet/endpoints.py
    index e94a839..eb37950 100644
    def _parseSSL(factory, port, privateKey="server.pem", certKey=None, 
    935935
    936936    @param extraCertChain: The path of a file containing one or more
    937937        certificates in PEM format that establish the chain from a root CA to
    938         the CA that signed your L{certKey}.
     938        the CA that signed your C{certKey}.
    939939    @type extraCertChain: L{bytes}
    940940
    941941    @return: a 2-tuple of (args, kwargs), describing  the parameters to
  • twisted/internet/test/test_endpoints.py

    diff --git twisted/internet/test/test_endpoints.py twisted/internet/test/test_endpoints.py
    index 1504421..a8e83a2 100644
    class ServerStringTests(unittest.TestCase): 
    18381838        self.assertIsInstance(ctx, ContextType)
    18391839
    18401840
    1841     # Use a class variable to ensure we use the exactly same endpoint string
    1842     # except for the chain file itself.
    1843     SSL_CHAIN_TEMPLATE = ("ssl:1234:privateKey=%s:extraCertChain=%%s"
    1844                           % (escapedPEMPathName,))
     1841    if not skipSSL:
     1842        # Use a class variable to ensure we use the exactly same endpoint
     1843        # string except for the chain file itself.
     1844        SSL_CHAIN_TEMPLATE = ("ssl:1234:privateKey=%s:extraCertChain=%%s"
     1845                              % (escapedPEMPathName,))
    18451846
    18461847
    18471848    def test_sslChainLoads(self):