[Unicore-cvs-commits] SF.net SVN: unicore:[14557] tools/deployment-tests-scripts/testcases.d

[<ppi...@us...>]

Revision: 14557
          http://unicore.svn.sourceforge.net/unicore/?rev=14557&view=rev
Author:   ppiernik
Date:     2012-10-08 19:57:06 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
fix test

Modified Paths:
--------------
    tools/deployment-tests-scripts/testcases.d/uvos
    tools/deployment-tests-scripts/testcases.d/xuudb

Modified: tools/deployment-tests-scripts/testcases.d/uvos
===================================================================
--- tools/deployment-tests-scripts/testcases.d/uvos	2012-10-08 18:41:54 UTC (rev 14556)
+++ tools/deployment-tests-scripts/testcases.d/uvos	2012-10-08 19:57:06 UTC (rev 14557)
@@ -48,14 +48,20 @@
 
 
 	F=/etc/unicore/uvos-clc/uvosClient.conf
-	conf_properties $F keystore /etc/unicore/uvos-server/certs/dummyServer.jks
-	conf_properties $F keystoreType JKS
-	conf_properties $F keystorePasswd the!server
-	conf_properties $F keystoreAlias mykey
+	conf_properties $F credential.path /etc/unicore/uvos-server/certs/dummyServer.jks
+	conf_properties $F credential.format JKS
+	conf_properties $F credential.password the!server
+	conf_properties $F credential.keyAlias mykey
 	conf_properties $F keyPasswd _COMMENT
-	conf_properties $F truststore /etc/unicore/uvos-server/certs/dummyServerTruststore.jks
-	conf_properties $F truststorePasswd the!server
-	conf_properties $F truststoreType JKS
+	conf_properties $F truststore.keystorePath /etc/unicore/uvos-server/certs/dummyServerTruststore.jks
+	conf_properties $F truststore.keystorePassword the!server
+	conf_properties $F truststore.type keystore
+	conf_properties $F uvos.serverHostnameChecking NONE
+	conf_properties $F client.sslAuthnEnabled=false
+	conf_properties $F client.httpAuthnEnabled=true
+	conf_properties $F client.httpUser=voadmin@localhost
+	conf_properties $F client.httpPassword " "
+		
 }
 
 

Modified: tools/deployment-tests-scripts/testcases.d/xuudb
===================================================================
--- tools/deployment-tests-scripts/testcases.d/xuudb	2012-10-08 18:41:54 UTC (rev 14556)
+++ tools/deployment-tests-scripts/testcases.d/xuudb	2012-10-08 19:57:06 UTC (rev 14557)
@@ -26,9 +26,9 @@
         conf_properties $F xuudb.credential.path /etc/unicore/xuudb/xuudb.jks
         conf_properties $F xuudb.credential.format JKS
         conf_properties $F xuudb.credential.password the!xuudb
-        conf_properties $F xuudb.truststore.type _COMMENT
-        conf_properties $F xuudb.truststore.keystorePath _COMMENT
-        conf_properties $F xuudb.truststore.keystorePassword _COMMENT
+        conf_properties $F xuudb.truststore.type keystore
+        conf_properties $F xuudb.truststore.keystorePath /etc/unicore/xuudb/xuudb.jks
+        conf_properties $F xuudb.truststore.keystorePassword the!xuudb
         conf_properties $F xuudb.dynamicAttributesConfig /etc/unicore/xuudb/dap-configuration.xml
 
         echo "emailAddress=uni...@li...,C=DE,O=unicore.eu,OU=Testing,CN=UNICORE demo xuudb" >> /etc/unicore/xuudb/xuudb.acl
@@ -39,11 +39,11 @@
         conf_properties $F xuudb.credential.path /etc/unicore/xuudb/xuudb.jks
         conf_properties $F xuudb.credential.format JKS
         conf_properties $F xuudb.credential.password the!xuudb
-        conf_properties $F xuudb.truststore.type _COMMENT
-        conf_properties $F xuudb.truststore.keystorePath _COMMENT
-        conf_properties $F xuudb.truststore.keystorePassword _COMMENT
+        conf_properties $F xuudb.truststore.type keystore
+        conf_properties $F xuudb.truststore.keystorePath /etc/unicore/xuudb/xuudb.jks
+        conf_properties $F xuudb.truststore.keystorePassword the!xuudb
+        conf_properties $F xuudb.batch true
 
-
 }
 
 function test_with_client
@@ -64,7 +64,7 @@
                 exit -1
         fi
 
-        LINE=`echo "$OUTPUT" | grep 'TESTID.*|.*nobody.*|user.*|testing.*|EMAILADDRESS=uni...@li..., C=DE, O=unicore.eu, OU=Testing, CN=UNICORE demo user'`
+        LINE=`echo "$OUTPUT" | grep '.*1|.*TESTID|.*nobody|.*user|.*testing|EMAILADDRESS=uni...@li...,C=de,O=unicore.eu,OU=testing,CN=unicore demo user.*'`
         if [ -z "$LINE" ] ; then
                 echoe "XUUDB Admin client didn't returned the user recored added a moment before."
                 exit -1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.