From 72225bd2fb08eb4160089ae4f2a7ea461edf0e7d Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Tue, 17 Oct 2006 14:21:36 +0000
Subject: [PATCH] Fix for Issue 804.
---
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java | 4 ++--
/dev/null | 9 ---------
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java | 4 ++--
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java | 4 ++--
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java | 4 ++--
5 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java
index 6171d6f..d338c86 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java
@@ -95,7 +95,7 @@
output_str += "ds-task-backup-backend-id: userRoot\n";
output_str += "ds-backup-directory-path: " + exportDir + "/backup_task\n";
- String backup_task_file = integration_test_home + "/backend/data/add_task_backup.ldif";
+ String backup_task_file = logDir + "/add_task_backup.ldif";
output = new BufferedWriter(new FileWriter(backup_task_file));
output.write(output_str);
}
@@ -109,7 +109,7 @@
output.close();
}
- String datafile = integration_test_home + "/backend/data/add_task_backup.ldif";
+ String datafile = logDir + "/add_task_backup.ldif";
String mod_args[] = {"-a", "-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
ds_output.redirectOutput(logDir, "BackupTasksTests1.txt");
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java
index 0f37d6d..1cf2210 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java
@@ -97,7 +97,7 @@
output_str += "ds-task-export-backend-id: userRoot\n";
output_str += "ds-task-export-include-branch: o=backend tests,dc=example,dc=com\n";
- String export_task_file = integration_test_home + "/backend/data/add_task_export.ldif";
+ String export_task_file = logDir + "/add_task_export.ldif";
output = new BufferedWriter(new FileWriter(export_task_file));
output.write(output_str);
}
@@ -111,7 +111,7 @@
output.close();
}
- String datafile = integration_test_home + "/backend/data/add_task_export.ldif";
+ String datafile = logDir + "/add_task_export.ldif";
String mod_args[] = {"-a", "-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
ds_output.redirectOutput(logDir, "ExportTasksTests1.txt");
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java
index 81c2a18..0515dff 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java
@@ -99,7 +99,7 @@
output_str += "ds-task-import-backend-id: userRoot\n";
output_str += "ds-task-import-skip-schema-validation: FALSE\n";
- String import_task_file = integration_test_home + "/backend/data/add_task_import.ldif";
+ String import_task_file = logDir + "/add_task_import.ldif";
output = new BufferedWriter(new FileWriter(import_task_file));
output.write(output_str);
}
@@ -113,7 +113,7 @@
output.close();
}
- String datafile = integration_test_home + "/backend/data/add_task_import.ldif";
+ String datafile = logDir + "/add_task_import.ldif";
String mod_args[] = {"-a", "-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
ds_output.redirectOutput(logDir, "ImportTasksTests1.txt");
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java
index f9f5a4b..877cf6b 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java
@@ -97,7 +97,7 @@
output_str += "ds-task-class-name: org.opends.server.tasks.RestoreTask\n";
output_str += "ds-backup-directory-path: " + integration_test_home + "/backend/data/restore.task\n";
- String restore_task_file = integration_test_home + "/backend/data/add_task_restore.ldif";
+ String restore_task_file = logDir + "/add_task_restore.ldif";
output = new BufferedWriter(new FileWriter(restore_task_file));
output.write(output_str);
}
@@ -111,7 +111,7 @@
output.close();
}
- String datafile = integration_test_home + "/backend/data/add_task_restore.ldif";
+ String datafile = logDir + "/add_task_restore.ldif";
String mod_args[] = {"-a", "-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
ds_output.redirectOutput(logDir, "RestoreTasksTests1.txt");
int retCode = LDAPModify.mainModify(mod_args);
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_export.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_export.ldif
deleted file mode 100644
index 29d8ed3..0000000
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_export.ldif
+++ /dev/null
@@ -1,9 +0,0 @@
-dn: ds-task-id=2,cn=Scheduled Tasks,cn=tasks
-objectclass: top
-objectclass: ds-task
-objectclass: ds-task-export
-ds-task-id: 2
-ds-task-class-name: org.opends.server.tasks.ExportTask
-ds-task-export-ldif-file: /export00/dsee7/src/openDS/trunk/opends/tests/integration-tests-testng/opends/export_task.ldif
-ds-task-export-backend-id: userRoot
-ds-task-export-include-branch: o=backend tests,dc=example,dc=com
--
Gitblit v1.10.0