Ignore:
Timestamp:
09/01/08 17:06:38 (12 years ago)
Author:
pjkersha
Message:

fixes to X509, XMLSecDoc, wsSecurity and sessionMgrClient unit tests - latter still to complete

security/python/ndg.security.test/ndg/security/test/SecurityCGItest.py: deleted as this code is no longer needed. Pylons code replaces it. The module that the unit test is based still exists.

security/python/ndg.security.test/ndg/security/test/sessionMgrClient/README: more detailed instructions

security/python/ndg.security.test/ndg/security/test/server.py: repalce equivalent .sh bash script with python version

security/python/ndg.security.test/ndg/security/test/sessionMgrClient/sessionMgrClient.cfg: extra comments and use unit test dir env var to ref all files to enable running from any dir

security/python/ndg.security.test/ndg/security/test/sessionMgrClient/SessionMgrClient.py: part way through refactoring for changes as of the previous

security/python/ndg.security.test/ndg/security/test/sessionMgrClient/sessionMgrProperties.xml: fix env var refs.

security/python/ndg.security.test/ndg/security/test/wsSecurity/*,
security/python/ndg.security.test/ndg/security/test/X509/*,
security/python/ndg.security.test/ndg/security/test/XMLSecDoc/*: fixed for use with env vars

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/sessionMgrProperties.xml

    r3145 r3195  
    44    <useSSL>Yes</useSSL> <!-- leave blank to use http --> 
    55    <!--<useSSL>Yes</useSSL>  leave blank to use http --> 
    6     <sslCertFile>$NDGSEC_SM_UNITTEST_DIR/sm.crt</sslCertFile> 
    7     <sslKeyFile>$NDGSEC_SM_UNITTEST_DIR/sm.key</sslKeyFile> 
     6    <sslCertFile>$NDGSEC_SMCLNT_UNITTEST_DIR/sm.crt</sslCertFile> 
     7    <sslKeyFile>$NDGSEC_SMCLNT_UNITTEST_DIR/sm.key</sslKeyFile> 
    88    <!--  
    99    Directory containing CA cert.s to verify SSL peer cert against  
    1010     - ignored if useSSL is blank  
    1111    --> 
    12     <sslCACertDir>$NDGSEC_SM_UNITTEST_DIR/ca</sslCACertDir> 
     12    <sslCACertDir>$NDGSEC_SMCLNT_UNITTEST_DIR/ca</sslCACertDir> 
    1313    <!-- 
    1414    PKI settings for WS-Security signature of outbound SOAP messages 
     
    2323    --> 
    2424    <caCertFileList> 
    25         <caCertFile>$NDGSEC_SM_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    26         <caCertFile>$NDGSEC_SM_UNITTEST_DIR/ca/cacert.pem</caCertFile> 
     25        <caCertFile>$NDGSEC_SMCLNT_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    2726    </caCertFileList> 
    28     <certFile>$NDGSEC_SM_UNITTEST_DIR/sm.crt</certFile> 
    29     <keyFile>$NDGSEC_SM_UNITTEST_DIR/sm.key</keyFile> 
     27    <certFile>$NDGSEC_SMCLNT_UNITTEST_DIR/sm.crt</certFile> 
     28    <keyFile>$NDGSEC_SMCLNT_UNITTEST_DIR/sm.key</keyFile> 
    3029    <keyPwd/> 
    3130    <!--  
     
    6766                but the settings can be independent of any Globus installation 
    6867                --> 
    69                 <openSSLConfFilePath>$NDGSEC_SM_UNITTEST_DIR/openssl.conf</openSSLConfFilePath> 
     68                <openSSLConfFilePath>$NDGSEC_SMCLNT_UNITTEST_DIR/openssl.conf</openSSLConfFilePath> 
    7069                <tmpDir>/tmp</tmpDir> 
    7170                <!--  
     
    7978                --> 
    8079                <proxyCertLifetime>43200</proxyCertLifetime> <!-- in seconds --> 
    81                 <caCertFile>$NDGSEC_SM_UNITTEST_DIR/ca/cacert.pem</caCertFile> 
     80                <caCertFile>$NDGSEC_SMCLNT_UNITTEST_DIR/ca/cacert.pem</caCertFile> 
    8281        </myProxyProp> 
    8382        <simpleCACltProp> 
Note: See TracChangeset for help on using the changeset viewer.