Changeset 4140 for TI12-security


Ignore:
Timestamp:
27/08/08 16:12:07 (11 years ago)
Author:
cbyrom
Message:

Fix property keywords in test cases - since these don't use the Case Sensitive parse
the names need to be lowercased.

Location:
TI12-security/trunk/python/ndg.security.test/ndg/security/test
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/XMLSecDoc/xmlSecDocTest.py

    r4138 r4140  
    8989        self.xmlSecDoc.filePath = xpdVars(self.cfg['test2Sign']['filepath']) 
    9090        self.xmlSecDoc.certFilePathList = \ 
    91                                 xpdVars(self.cfg['test2Sign']['signingCertFilePath']) 
     91                                xpdVars(self.cfg['test2Sign']['signingcertfilepath']) 
    9292        self.xmlSecDoc.signingKeyFilePath = \ 
    93                                 xpdVars(self.cfg['test2Sign']['keyfile']) 
     93                                xpdVars(self.cfg['test2Sign']['signingprikeyfilepath']) 
    9494         
    95         keyPwd = self.cfg['test2Sign'].get('signingPriKeyPwd') 
     95        keyPwd = self.cfg['test2Sign'].get('signingprikeypwd') 
    9696        if keyPwd is None: 
    9797            self.xmlSecDoc.signingKeyPwd = \ 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteAServer.py

    r3189 r4140  
    2222from twisted.python.runtime import platformType 
    2323if platformType == "win32": 
    24     from twisted.scripts._twistw import run 
     24    from twisted.scripts.twistd import run 
     25    #from twisted.scripts._twistw import run 
    2526else: 
    2627    from twisted.scripts.twistd import run 
     
    3536    os.environ['NDGSEC_AA_PROPFILEPATH'] = \ 
    3637                        os.path.join(os.environ['NDGSEC_AACLNT_UNITTEST_DIR'], 
     38#                                     "siteAAttAuthority.cfg") 
    3739                                     "siteAAttAuthorityProperties.xml") 
    38      
     40    
    3941if 'NDGSEC_DIR' in os.environ: 
    4042    tacFilePath=os.path.join(os.environ['NDGSEC_DIR'], 
     
    4749    tacFilePath = os.path.join(eggConfigDir, "attAuthority.tac") 
    4850 
    49 sys.argv += ["--pidfile=twistd-%d.pid" % os.getpid(), "-noy", tacFilePath] 
     51# NB, pid not required on windows - this just causes an error to be thrown 
     52if platformType != "win32": 
     53    sys.argv += ["--pidfile=twistd-%d.pid" % os.getpid()] 
     54sys.argv += ["-noy", tacFilePath]     
     55print "Running: %s" %sys.argv 
    5056run() 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteBServer.py

    r3189 r4140  
    2222from twisted.python.runtime import platformType 
    2323if platformType == "win32": 
    24     from twisted.scripts._twistw import run 
     24    from twisted.scripts.twistd import run 
     25    #from twisted.scripts._twistw import run 
    2526else: 
    2627    from twisted.scripts.twistd import run 
     
    4748    tacFilePath = os.path.join(eggConfigDir, "attAuthority.tac") 
    4849 
    49 sys.argv += ["--pidfile=twistd-%d.pid" % os.getpid(), "-noy", tacFilePath] 
     50# NB, pid not required on windows - this just causes an error to be thrown 
     51if platformType != "win32": 
     52    sys.argv += ["--pidfile=twistd-%d.pid" % os.getpid()] 
     53sys.argv += ["-noy", tacFilePath]     
    5054run() 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attCert/AttCertTest.py

    r4138 r4140  
    188188        self.attCert.filePath = xpdVars(self.cfg['test9Sign']['filepath']) 
    189189        self.attCert.certFilePathList = \ 
    190             xpdVars(self.cfg['test9Sign']['signingCertFilePath']) 
     190            xpdVars(self.cfg['test9Sign']['signingcertfilepath']) 
    191191        self.attCert.signingKeyFilePath = \ 
    192             xpdVars(self.cfg['test9Sign']['signingPriKeyFilePath']) 
    193          
    194         signingKeyPwd = self.cfg['test9Sign'].get('signingPriKeyPwd') 
     192            xpdVars(self.cfg['test9Sign']['signingprikeyfilepath']) 
     193         
     194        signingKeyPwd = self.cfg['test9Sign'].get('signingprikeypwd') 
    195195        if signingKeyPwd is None: 
    196196            try: 
     
    241241            self.cfg['test13IsValidStressTest']['certfilepathlist'].split()] 
    242242        self.attCert.signingKeyFilePath = \ 
    243                         xpdVars(self.cfg['test13IsValidStressTest']['signingPriKeyFilePath']) 
    244          
    245         signingKeyPwd = self.cfg['test13IsValidStressTest'].get('signingPriKeyPwd') 
     243                        xpdVars(self.cfg['test13IsValidStressTest']['signingprikeyfilepath']) 
     244         
     245        signingKeyPwd = self.cfg['test13IsValidStressTest'].get('signingprikeypwd') 
    246246        if signingKeyPwd is None: 
    247247            try: 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/myProxy/MyProxyClientTest.py

    r4138 r4140  
    6464                              prompt="\ntest1Store cred. owner pass-phrase: ") 
    6565 
    66         certFile = xpdVars(self.cfg['test1Store']['signingCertFilePath']) 
    67         keyFile = xpdVars(self.cfg['test1Store']['signingPriKeyFilePath']) 
     66        certFile = xpdVars(self.cfg['test1Store']['signingcertfilepath']) 
     67        keyFile = xpdVars(self.cfg['test1Store']['signingprikeyfilepath']) 
    6868        ownerCertFile = xpdVars(self.cfg['test1Store']['ownercertfile']) 
    6969        ownerKeyFile = xpdVars(self.cfg['test1Store']['ownerkeyfile']) 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionCookie/SessionCookieTest.py

    r3192 r4140  
    5252            try: 
    5353                self.__class__.priKeyPwd = configParser.get('setUp',  
    54                                                             'priKeyPwd') 
     54                                                            'prikeypwd') 
    5555            except NoOptionError: 
    5656                try: 
     
    6060                    raise SystemExit 
    6161         
    62         self.priKeyFilePath=xpdVars(configParser.get('setUp','priKeyFilePath')) 
     62        self.priKeyFilePath=xpdVars(configParser.get('setUp','prikeyfilepath')) 
    6363         
    6464        self.cookie.x509CertFilePath = xpdVars(configParser.get('setUp',  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/xmlsec/etree/test_etree.py

    r4138 r4140  
    8686                    xpdVars(self.cfg['test2SignWithInclC14N']['filepath']) 
    8787        self.xmlSecDoc.certFilePathList = \ 
    88                     xpdVars(self.cfg['test2SignWithInclC14N']['signingCertFilePath']) 
     88                    xpdVars(self.cfg['test2SignWithInclC14N']['signingcertfilepath']) 
    8989        self.xmlSecDoc.signingKeyFilePath = \ 
    90                     xpdVars(self.cfg['test2SignWithInclC14N']['keyfile']) 
     90                    xpdVars(self.cfg['test2SignWithInclC14N']['signingprikeyfilepath']) 
    9191 
    92         keyPwd = self.cfg['test2SignWithInclC14N'].get('signingPriKeyPwd') 
     92        keyPwd = self.cfg['test2SignWithInclC14N'].get('signingprikeypwd') 
    9393        if keyPwd is None: 
    9494            self.xmlSecDoc.signingKeyPwd = getpass.getpass(prompt=\ 
     
    106106                    xpdVars(self.cfg['test3SignWithExclC14N']['filepath']) 
    107107        self.xmlSecDoc.certFilePathList = \ 
    108                     xpdVars(self.cfg['test3SignWithExclC14N']['signingCertFilePath']) 
     108                    xpdVars(self.cfg['test3SignWithExclC14N']['signingcertfilepath']) 
    109109        self.xmlSecDoc.signingKeyFilePath = \ 
    110110                    xpdVars(self.cfg['test3SignWithExclC14N']['keyfile']) 
    111111 
    112         keyPwd = self.cfg['test3SignWithExclC14N'].get('signingPriKeyPwd') 
     112        keyPwd = self.cfg['test3SignWithExclC14N'].get('signingprikeypwd') 
    113113        if keyPwd is None: 
    114114            self.xmlSecDoc.signingKeyPwd = getpass.getpass(prompt=\ 
Note: See TracChangeset for help on using the changeset viewer.