Changeset 4140

Timestamp:

27/08/08 16:12:07 (12 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:

• XMLSecDoc/xmlSecDocTest.py (modified) (1 diff)
• attAuthority/siteAServer.py (modified) (3 diffs)
• attAuthority/siteBServer.py (modified) (2 diffs)
• attCert/AttCertTest.py (modified) (2 diffs)
• myProxy/MyProxyClientTest.py (modified) (1 diff)
• sessionCookie/SessionCookieTest.py (modified) (2 diffs)
• xmlsec/etree/test_etree.py (modified) (2 diffs)

TI12-security/trunk/python/ndg.security.test/ndg/security/test/XMLSecDoc/xmlSecDocTest.py

@@ -89 +89 @@
         self.xmlSecDoc.filePath = xpdVars(self.cfg['test2Sign']['filepath'])
         self.xmlSecDoc.certFilePathList = \
-                                xpdVars(self.cfg['test2Sign']['signingCertFilePath'])
+                                xpdVars(self.cfg['test2Sign']['signingcertfilepath'])
         self.xmlSecDoc.signingKeyFilePath = \
-                                xpdVars(self.cfg['test2Sign']['keyfile'])
+                                xpdVars(self.cfg['test2Sign']['signingprikeyfilepath'])
         
-        keyPwd = self.cfg['test2Sign'].get('signingPriKeyPwd')
+        keyPwd = self.cfg['test2Sign'].get('signingprikeypwd')
         if keyPwd is None:
             self.xmlSecDoc.signingKeyPwd = \

TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteAServer.py

@@ -22 +22 @@
 from twisted.python.runtime import platformType
 if platformType == "win32":
-    from twisted.scripts._twistw import run
+    from twisted.scripts.twistd import run
+    #from twisted.scripts._twistw import run
 else:
     from twisted.scripts.twistd import run
@@ -35 +36 @@
     os.environ['NDGSEC_AA_PROPFILEPATH'] = \
                         os.path.join(os.environ['NDGSEC_AACLNT_UNITTEST_DIR'],
+#                                     "siteAAttAuthority.cfg")
                                      "siteAAttAuthorityProperties.xml")
-    
+   
 if 'NDGSEC_DIR' in os.environ:
     tacFilePath=os.path.join(os.environ['NDGSEC_DIR'],
@@ -47 +49 @@
     tacFilePath = os.path.join(eggConfigDir, "attAuthority.tac")
 
-sys.argv += ["--pidfile=twistd-%d.pid" % os.getpid(), "-noy", tacFilePath]
+# NB, pid not required on windows - this just causes an error to be thrown
+if platformType != "win32":
+    sys.argv += ["--pidfile=twistd-%d.pid" % os.getpid()]
+sys.argv += ["-noy", tacFilePath]    
+print "Running: %s" %sys.argv
 run()

TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteBServer.py

@@ -22 +22 @@
 from twisted.python.runtime import platformType
 if platformType == "win32":
-    from twisted.scripts._twistw import run
+    from twisted.scripts.twistd import run
+    #from twisted.scripts._twistw import run
 else:
     from twisted.scripts.twistd import run
@@ -47 +48 @@
     tacFilePath = os.path.join(eggConfigDir, "attAuthority.tac")
 
-sys.argv += ["--pidfile=twistd-%d.pid" % os.getpid(), "-noy", tacFilePath]
+# NB, pid not required on windows - this just causes an error to be thrown
+if platformType != "win32":
+    sys.argv += ["--pidfile=twistd-%d.pid" % os.getpid()]
+sys.argv += ["-noy", tacFilePath]    
 run()

TI12-security/trunk/python/ndg.security.test/ndg/security/test/attCert/AttCertTest.py

@@ -188 +188 @@
         self.attCert.filePath = xpdVars(self.cfg['test9Sign']['filepath'])
         self.attCert.certFilePathList = \
-            xpdVars(self.cfg['test9Sign']['signingCertFilePath'])
+            xpdVars(self.cfg['test9Sign']['signingcertfilepath'])
         self.attCert.signingKeyFilePath = \
-            xpdVars(self.cfg['test9Sign']['signingPriKeyFilePath'])
-        
-        signingKeyPwd = self.cfg['test9Sign'].get('signingPriKeyPwd')
+            xpdVars(self.cfg['test9Sign']['signingprikeyfilepath'])
+        
+        signingKeyPwd = self.cfg['test9Sign'].get('signingprikeypwd')
         if signingKeyPwd is None:
             try:
@@ -241 +241 @@
             self.cfg['test13IsValidStressTest']['certfilepathlist'].split()]
         self.attCert.signingKeyFilePath = \
-                        xpdVars(self.cfg['test13IsValidStressTest']['signingPriKeyFilePath'])
-        
-        signingKeyPwd = self.cfg['test13IsValidStressTest'].get('signingPriKeyPwd')
+                        xpdVars(self.cfg['test13IsValidStressTest']['signingprikeyfilepath'])
+        
+        signingKeyPwd = self.cfg['test13IsValidStressTest'].get('signingprikeypwd')
         if signingKeyPwd is None:
             try:

TI12-security/trunk/python/ndg.security.test/ndg/security/test/myProxy/MyProxyClientTest.py

@@ -64 +64 @@
                               prompt="\ntest1Store cred. owner pass-phrase: ")
 
-        certFile = xpdVars(self.cfg['test1Store']['signingCertFilePath'])
-        keyFile = xpdVars(self.cfg['test1Store']['signingPriKeyFilePath'])
+        certFile = xpdVars(self.cfg['test1Store']['signingcertfilepath'])
+        keyFile = xpdVars(self.cfg['test1Store']['signingprikeyfilepath'])
         ownerCertFile = xpdVars(self.cfg['test1Store']['ownercertfile'])
         ownerKeyFile = xpdVars(self.cfg['test1Store']['ownerkeyfile'])

TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionCookie/SessionCookieTest.py

@@ -52 +52 @@
             try:
                 self.__class__.priKeyPwd = configParser.get('setUp', 
-                                                            'priKeyPwd')
+                                                            'prikeypwd')
             except NoOptionError:
                 try:
@@ -60 +60 @@
                     raise SystemExit
         
-        self.priKeyFilePath=xpdVars(configParser.get('setUp','priKeyFilePath'))
+        self.priKeyFilePath=xpdVars(configParser.get('setUp','prikeyfilepath'))
         
         self.cookie.x509CertFilePath = xpdVars(configParser.get('setUp', 

TI12-security/trunk/python/ndg.security.test/ndg/security/test/xmlsec/etree/test_etree.py

@@ -86 +86 @@
                     xpdVars(self.cfg['test2SignWithInclC14N']['filepath'])
         self.xmlSecDoc.certFilePathList = \
-                    xpdVars(self.cfg['test2SignWithInclC14N']['signingCertFilePath'])
+                    xpdVars(self.cfg['test2SignWithInclC14N']['signingcertfilepath'])
         self.xmlSecDoc.signingKeyFilePath = \
-                    xpdVars(self.cfg['test2SignWithInclC14N']['keyfile'])
+                    xpdVars(self.cfg['test2SignWithInclC14N']['signingprikeyfilepath'])
 
-        keyPwd = self.cfg['test2SignWithInclC14N'].get('signingPriKeyPwd')
+        keyPwd = self.cfg['test2SignWithInclC14N'].get('signingprikeypwd')
         if keyPwd is None:
             self.xmlSecDoc.signingKeyPwd = getpass.getpass(prompt=\
@@ -106 +106 @@
                     xpdVars(self.cfg['test3SignWithExclC14N']['filepath'])
         self.xmlSecDoc.certFilePathList = \
-                    xpdVars(self.cfg['test3SignWithExclC14N']['signingCertFilePath'])
+                    xpdVars(self.cfg['test3SignWithExclC14N']['signingcertfilepath'])
         self.xmlSecDoc.signingKeyFilePath = \
                     xpdVars(self.cfg['test3SignWithExclC14N']['keyfile'])
 
-        keyPwd = self.cfg['test3SignWithExclC14N'].get('signingPriKeyPwd')
+        keyPwd = self.cfg['test3SignWithExclC14N'].get('signingprikeypwd')
         if keyPwd is None:
             self.xmlSecDoc.signingKeyPwd = getpass.getpass(prompt=\