From 5cb396d6a8bd6ea39334f90f99bb716b642ede7f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 15 Jun 2010 14:50:12 +0000
Subject: [PATCH] Improve tests for clu, dsconfig and backend. Also preserve code coverage reports when failing
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml | 4 ++--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml | 3 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml | 4 +---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml | 25 +++++++++++++++++++++++++
6 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml
index 3abbc4e..e7a55fe 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml
@@ -772,8 +772,7 @@
</call>
<call function="'checkImport'">
- { 'expectedEntries' : ['dc=com','dc=example,dc=com'],
- 'missingEntries' : ['ou=People,dc=example,dc=com'],
+ { 'expectedEntries' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsPort' : DsInstancePort,
'dsAdminPort' : DsInstanceAdminPort,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
index 79231e5..76f56a2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
@@ -485,8 +485,7 @@
</call>
<call function="'checkImport'">
- { 'expectedEntries' : ['dc=com','dc=example,dc=com'],
- 'missingEntries' : ['ou=People,dc=example,dc=com'],
+ { 'expectedEntries' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
'startDS' : 'no'
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
index 7db33d8..4996bbc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
@@ -504,9 +504,7 @@
</call>
<call function="'checkImport'">
- { 'expectedEntries' : ['dc=com','dc=example,dc=com'],
- 'missingEntries' : ['ou=People,dc=example,dc=com']
- }
+ { 'expectedEntries' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'] }
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
index 016c7a8..96b627a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
@@ -236,7 +236,7 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'Total: 19'
+ 'expectedString' : 'Total: 20'
}
</call>
@@ -309,7 +309,7 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'Total: 23'
+ 'expectedString' : 'Total: 24'
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml
index 3c4a62e..8e80cf4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml
@@ -222,7 +222,7 @@
<!-- Search for uniqueMember indexes -->
<call function="'searchString'">
- { 'expectedString' : 'uniqueMember : generic : equality',
+ { 'expectedString' : 'uniqueMember : generic : equality',
'returnString' : resultString ,
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml
index c90bdbe..2661049 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml
@@ -209,6 +209,31 @@
'path' : remoteCoveragePath
}
</call>
+
+ <if expr="RC != 0">
+ <sequence>
+ <message>
+ 'Zip up coverage files to %s/coverage.zip' % remote.temp
+ </message>
+ <call function="'zipUpFile'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'zipfile' : '%s/coverage.zip' % remote.temp,
+ 'folder' : '%s/coverage' % remote.temp,
+ 'relativeto' : remote.temp
+ }
+ </call>
+
+ <message>
+ 'Copy coverage zip archive to %s/coverage.zip' % local.temp
+ </message>
+ <call function="'copyFile'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'srcfile' : '%s/coverage.zip' % remote.temp,
+ 'destfile' : '%s/coverage.zip' % local.temp,
+ 'remotehost' : STAXServiceMachine }
+ </call>
+ </sequence>
+ </if>
</sequence>
</if>
--
Gitblit v1.10.0