Ignore:
Timestamp:
05/01/09 14:43:08 (11 years ago)
Author:
pjkersha
Message:

Refactored x509, xmlsec, XMLSecDoc and combinedservices unit tests separating out test files into the config dir.

Location:
TI12-security/trunk/python/ndg.security.test/ndg/security/test/wssecurity/server
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wssecurity/server/echoServer.cfg

    r4680 r4739  
    99[setUp] 
    1010hostname = localhost 
    11 port = 7000 
     11port = 7500 
    1212path = /Echo 
    1313wsseCfgFilePath = $NDGSEC_WSSESRV_UNITTEST_DIR/wssecurity.cfg 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wssecurity/server/echoServer.py

    r4254 r4739  
    1717 
    1818from os.path import expandvars as xpdVars 
    19 from os.path import join as jnPath 
    20 mkPath = lambda file: jnPath(os.environ['NDGSEC_WSSESRV_UNITTEST_DIR'], file) 
     19from os.path import join, dirname, abspath 
     20mkPath = lambda file: join(os.environ['NDGSEC_WSSESRV_UNITTEST_DIR'], file) 
    2121 
    2222import logging 
    2323log = logging.getLogger(__name__) 
     24logging.basicConfig(level=logging.DEBUG, 
     25                    format='%(asctime)s %(filename)s:%(lineno)d ' 
     26                    '%(levelname)s %(message)s') 
     27 
     28 
     29from ndg.security.test import BaseTestCase 
     30 
     31# Initialize environment for unit tests 
     32if BaseTestCase.configDirEnvVarName not in os.environ: 
     33    os.environ[BaseTestCase.configDirEnvVarName] = \ 
     34                join(dirname(dirname(abspath(dirname(__file__)))), 'config') 
    2435 
    2536class EchoService(_EchoService): 
     
    2940        # Stop in debugger at beginning of SOAP stub if environment variable  
    3041        # is set 
    31         logging.basicConfig(level=logging.DEBUG, 
    32                             format='%(asctime)s %(filename)s:%(lineno)d ' 
    33                             '%(levelname)s %(message)s') 
    34  
    3542        self.__debug = bool(os.environ.get('NDGSEC_INT_DEBUG')) 
    3643        if self.__debug: 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/wssecurity/server/wssecurity.cfg

    r4680 r4739  
    2828 
    2929# ... or provide file path PEM encode cert here 
    30 #signingCertFilePath=$NDGSEC_WSSESRV_UNITTEST_DIR/server.crt 
    31 signingCertFilePath=$NDGSEC_WSSESRV_UNITTEST_DIR/java-ca-server.crt 
     30signingCertFilePath=$NDGSEC_UNITTEST_CONFIG_DIR/pki/wsse-server.crt 
     31#signingCertFilePath=$NDGSEC_UNITTEST_CONFIG_DIR/pki/java-ca-server.crt 
    3232 
    3333# Pass a list of certificates ',' separated PEM encoded certs constituting a  
     
    4141 
    4242# ... or provide file path to PEM encoded private key file 
    43 #signingPriKeyFilePath=$NDGSEC_WSSESRV_UNITTEST_DIR/server.key 
    44 signingPriKeyFilePath=$NDGSEC_WSSESRV_UNITTEST_DIR/java-ca-server.key 
     43signingPriKeyFilePath=$NDGSEC_UNITTEST_CONFIG_DIR/pki/wsse-server.key 
     44#signingPriKeyFilePath=$NDGSEC_UNITTEST_CONFIG_DIR/pki/java-ca-server.key 
    4545 
    4646# Password protecting private key.  Leave blank if there is no password. 
     
    9595# Provide a space separated list of file paths 
    9696# - NB, the two CA certificates are for the python and the java clients, respectively 
    97 caCertFilePathList=$NDGSEC_WSSESRV_UNITTEST_DIR/java-ca.crt $NDGSEC_WSSESRV_UNITTEST_DIR/ndg-test-ca.crt $NDGSEC_WSSESRV_UNITTEST_DIR/cacert.pem 
     97caCertFilePathList=$NDGSEC_UNITTEST_CONFIG_DIR/ca/java-ca.crt $NDGSEC_UNITTEST_CONFIG_DIR/ca/ndg-test-ca.crt 
Note: See TracChangeset for help on using the changeset viewer.