From 8df89db3e754dfad1fda63a06af77eed6c91877c Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 12 Mar 2007 13:23:52 +0000
Subject: [PATCH] Enable again the synchonization pushSchemaFilesChange test after fixing the problem : an unitialized variable was causing disable of the schema tests
---
opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java | 3 ++-
opends/ext/testng/testng.xml | 4 +++-
opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opends/ext/testng/testng.xml b/opends/ext/testng/testng.xml
index 2f59930..b8c149c 100644
--- a/opends/ext/testng/testng.xml
+++ b/opends/ext/testng/testng.xml
@@ -1,7 +1,9 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
<suite name="OpenDS" verbose="1" >
<test name="default">
- <!-- DO NOT REMOVE! - THIS LINE WILL BE REPLACED WITH TAGS GENERATED BY ANT -->
+ <packages>
+ <package name="org.opends.server.*" />
+ </packages>
</test>
<test name="precommit">
diff --git a/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java b/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
index 624d548..74ddde4 100644
--- a/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
+++ b/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
@@ -1644,7 +1644,8 @@
return true;
}
- if (result == ResultCode.NO_SUCH_OBJECT)
+ if ((result == ResultCode.NO_SUCH_OBJECT) ||
+ (result == ResultCode.OBJECTCLASS_VIOLATION))
{
/*
* The entry or it's new parent has not been found
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java
index 26ec1eb..bdcecf8 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java
@@ -82,7 +82,8 @@
{
// This test suite depends on having the schema available.
TestCaseUtils.startServer();
-
+ schemaCheck = DirectoryServer.checkSchema();
+
// find a free port for the changelog server
ServerSocket socket = TestCaseUtils.bindFreePort();
changelogPort = socket.getLocalPort();
--
Gitblit v1.10.0