From 3e7785a7cee4c79686cf83bbbf35ea7ab7828905 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 09 Dec 2013 21:36:47 +0000
Subject: [PATCH] Attempt to fix nightly unit test failures: forcefully clean the backend during each import. This shouldn't be necessary since there is only one suffix per backend.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
index 5a4955f..31a71d7 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
@@ -132,6 +132,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-R",
rejectFilePath,
"-n",
@@ -142,7 +143,7 @@
assertEquals(
ImportLDIF.mainImportLDIF(args, false, System.out, System.err), 0);
// Expecting a non-empty reject file.
- assertRejectedFile(reject, true);
+ assertRejectedFile(reject, false);
}
@@ -166,6 +167,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-R",
rejectFilePath,
"-n",
@@ -210,6 +212,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-n",
beID,
"-R",
@@ -254,6 +257,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-b",
baseDN,
"-R",
@@ -297,6 +301,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-n",
beID,
"-R",
@@ -338,6 +343,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-n",
beID,
"-R",
@@ -373,6 +379,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-n",
beID,
"-R",
@@ -413,6 +420,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-n",
beID,
"-R",
@@ -454,6 +462,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-n",
beID,
"-R",
@@ -497,7 +506,6 @@
@Test
public void testImportLDIFSelectiveExcludeAttributes() throws Exception
{
-
File reject = File.createTempFile("reject", ".ldif");
String rejectFilePath = reject.getAbsolutePath();
String[] args =
@@ -507,6 +515,7 @@
"--noPropertiesFile",
"-l",
ldifFilePath,
+ "-F",
"-n",
beID,
"-R",
--
Gitblit v1.10.0