Menu
▾
▴
[Opensync-commits] r395 - in trunk: . misc opensync plugins/file-sync plugins/file-sync/src tests tests/mock-plugin
|
From: <svn...@op...> - 2005-03-22 16:25:40
|
Author: azrael
Date: 2005-03-22 17:26:20 +0100 (Tue, 22 Mar 2005)
New Revision: 395
Added:
trunk/tests/mock-plugin/
trunk/tests/mock-plugin/Makefile.am
trunk/tests/mock-plugin/mock_format.c
trunk/tests/mock-plugin/mock_sync.c
trunk/tests/mock-plugin/mock_sync.h
Removed:
trunk/misc/opensync.spec
trunk/tests/mock-plugin/Makefile.am
trunk/tests/mock-plugin/mock_format.c
trunk/tests/mock-plugin/mock_sync.c
trunk/tests/mock-plugin/mock_sync.h
Modified:
trunk/configure.in
trunk/opensync/opensync_plugin.c
trunk/plugins/file-sync/configure.in
trunk/plugins/file-sync/src/file_sync.c
trunk/tests/Makefile.am
trunk/tests/check_codes.c
trunk/tests/check_env.c
trunk/tests/check_filter.c
trunk/tests/check_multisync.c
trunk/tests/check_sync.c
trunk/tests/check_vcard.c
trunk/tests/support.c
Log:
svn merge -r386:394 ../branches/experimental-branch/ .
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/configure.in 2005-03-22 16:26:20 UTC (rev 395)
@@ -164,6 +164,7 @@
opensync/Makefile
tools/Makefile
tests/Makefile
+tests/mock-plugin/Makefile
formats/Makefile
formats/vformats-xml/Makefile
osengine/Makefile
Deleted: trunk/misc/opensync.spec
Modified: trunk/opensync/opensync_plugin.c
===================================================================
--- trunk/opensync/opensync_plugin.c 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/opensync/opensync_plugin.c 2005-03-22 16:26:20 UTC (rev 395)
@@ -121,6 +121,7 @@
OSyncPlugin *osync_plugin_load(OSyncEnv *env, const char *path, OSyncError **error)
{
osync_trace(TRACE_ENTRY, "osync_plugin_load(%p, %s, %p)", env, path, error);
+
/* Check if this platform supports dynamic
* loading of modules */
if (!g_module_supported()) {
@@ -136,7 +137,6 @@
memset(&(plugin->info.functions), 0, sizeof(OSyncPluginFunctions));
if (!plugin->real_plugin) {
- osync_debug("OSPLG", 0, "Unable to open plugin %s", path);
osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to open plugin %s: %s", path, g_module_error());
osync_plugin_free(plugin);
osync_trace(TRACE_EXIT_ERROR, "osync_plugin_load: %s", osync_error_print(error));
@@ -186,7 +186,7 @@
osync_trace(TRACE_ENTRY, "osync_format_plugin_load(%p, %s, %p)", env, path, error);
/* Check if this platform supports dynamic
* loading of modules */
- osync_debug("OSFRM", 3, "Loading formats plugin from %s", path);
+
if (!g_module_supported()) {
osync_error_set(error, OSYNC_ERROR_GENERIC, "This platform does not support loading of modules");
osync_debug("OSPLG", 0, "This platform does not support loading of modules");
Modified: trunk/plugins/file-sync/configure.in
===================================================================
--- trunk/plugins/file-sync/configure.in 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/plugins/file-sync/configure.in 2005-03-22 16:26:20 UTC (rev 395)
@@ -34,21 +34,6 @@
AC_SUBST(OPENSYNC_FORMATSDIR)
AC_SUBST(OPENSYNC_HEADERDIR)
-AC_ARG_ENABLE(stress-tests, [ --enable-stress-tests enable support for stress testing],STRESS_TEST=$enableval)
-if test "x${STRESS_TEST}" = "xyes"; then
- AC_DEFINE(STRESS_TEST,1,[Stress Testing])
-fi
-
-AC_ARG_ENABLE(crash-tests, [ --enable-crash-tests enable support for crash testing],CRASH_TEST=$enableval)
-if test "x${CRASH_TEST}" = "xyes"; then
- AC_DEFINE(CRASH_TEST,1,[Crash Testing])
-fi
-
-AC_ARG_ENABLE(error-tests, [ --enable-error-tests enable support for error testing],ERROR_TEST=$enableval)
-if test "x${ERROR_TEST}" = "xyes"; then
- AC_DEFINE(ERROR_TEST,1,[Error Testing])
-fi
-
AC_CHECK_HEADER(fam.h,HAVE_FAM=1,HAVE_FAM=0)
AM_CONDITIONAL(ENABLE_FAM, test x$HAVE_FAM = x1)
AC_SUBST(HAVE_FAM)
@@ -74,23 +59,6 @@
echo "have libfam-dev installed."
fi
echo ""
-echo "Settings:"
-if test "x${STRESS_TEST}" = "xyes"; then
- echo "Stress Tests: Enabled"
-else
- echo "Stress Tests: Disabled"
-fi
-if test "x${ERROR_TEST}" = "xyes"; then
- echo "Error Tests: Enabled"
-else
- echo "Error Tests: Disabled"
-fi
-if test "x${CRASH_TEST}" = "xyes"; then
- echo "Crash Tests: Enabled"
-else
- echo "Crash Tests: Disabled"
-fi
-echo ""
echo "Plugin will be installed in ${OPENSYNC_PLUGINDIR}"
echo "Default config will be installed in ${OPENSYNC_CONFIGDIR}"
echo "Format will be installed in ${OPENSYNC_FORMATSDIR}"
Modified: trunk/plugins/file-sync/src/file_sync.c
===================================================================
--- trunk/plugins/file-sync/src/file_sync.c 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/plugins/file-sync/src/file_sync.c 2005-03-22 16:26:20 UTC (rev 395)
@@ -21,32 +21,6 @@
#include "file_sync.h"
#include <stdlib.h>
-#ifdef ERROR_TEST
-static osync_bool fs_get_error(OSyncMember *member, const char *domain)
-{
- osync_debug("FILE-SYNC", 4, "checking error domain %s", domain);
- const char *env = g_getenv(domain);
- if (!env)
- return FALSE;
-
- int num = atoi(env);
- int mask = 1 << (osync_member_get_id(member) - 1);
- osync_debug("FILE-SYNC", 2, "returning \"%s\" for error domain %s", (num & mask) ? "TRUE" : "FALSE", domain);
- if (num & mask) {
- char *chancestr = g_strdup_printf("%s_PROB", domain);
- const char *chance = g_getenv(chancestr);
- g_free(chancestr);
- if (!chance)
- return TRUE;
- int prob = atoi(chance);
- if (prob >= g_random_int_range(0, 100))
- return TRUE;
- osync_debug("FILE-SYNC", 2, "returning \"FALSE\" for error domain %s", domain);
- }
- return FALSE;
-}
-#endif
-
#ifdef HAVE_FAM
static gboolean _fam_prepare(GSource *source, gint *timeout_)
{
@@ -91,12 +65,7 @@
static void *fs_initialize(OSyncMember *member, OSyncError **error)
{
osync_debug("FILE-SYNC", 4, "start: %s", __func__);
-#ifdef ERROR_TEST
- if (fs_get_error(member, "INIT_NULL")) {
- osync_error_set(error, OSYNC_ERROR_EXPECTED, "Triggering INIT_NULL error");
- return NULL;
- }
-#endif
+
char *configdata;
int configsize;
filesyncinfo *fsinfo = g_malloc0(sizeof(filesyncinfo));
@@ -141,15 +110,6 @@
osync_debug("FILE-SYNC", 4, "start: %s", __func__);
filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
-#ifdef ERROR_TEST
- if (fs_get_error(fsinfo->member, "CONNECT_ERROR")) {
- osync_context_report_error(ctx, OSYNC_ERROR_EXPECTED, "Triggering CONNECT_ERROR error");
- return;
- }
- if (fs_get_error(fsinfo->member, "CONNECT_TIMEOUT"))
- return;
-#endif
-
OSyncError *error = NULL;
if (!osync_hashtable_load(fsinfo->hashtable, fsinfo->member, &error)) {
osync_context_report_osyncerror(ctx, &error);
@@ -260,17 +220,6 @@
osync_debug("FILE-SYNC", 4, "start: %s", __func__);
filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
-#ifdef ERROR_TEST
- if (fs_get_error(fsinfo->member, "GET_CHANGES_ERROR")) {
- osync_context_report_error(ctx, OSYNC_ERROR_EXPECTED, "Triggering GET_CHANGES_ERROR error");
- return;
- }
- if (fs_get_error(fsinfo->member, "GET_CHANGES_TIMEOUT"))
- return;
- if (fs_get_error(fsinfo->member, "GET_CHANGES_TIMEOUT2"))
- sleep(8);
-#endif
-
if (osync_member_get_slow_sync(fsinfo->member, "data")) {
osync_debug("FILE-SYNC", 3, "Slow sync requested");
osync_hashtable_set_slow_sync(fsinfo->hashtable, "data");
@@ -291,15 +240,6 @@
filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
fs_fileinfo *file_info = (fs_fileinfo *)osync_change_get_data(change);
-#ifdef ERROR_TEST
- if (fs_get_error(fsinfo->member, "GET_DATA_ERROR")) {
- osync_context_report_error(ctx, OSYNC_ERROR_EXPECTED, "Triggering GET_DATA_ERROR error");
- return;
- }
- if (fs_get_error(fsinfo->member, "GET_DATA_TIMEOUT"))
- return;
-#endif
-
char *filename = g_strdup_printf("%s/%s", fsinfo->path, osync_change_get_uid(change));
OSyncError *error = NULL;
if (!osync_file_read(filename, &file_info->data, &file_info->size, &error)) {
@@ -394,15 +334,6 @@
osync_debug("FILE-SYNC", 3, "Writing change %s with changetype %i", osync_change_get_uid(change), osync_change_get_changetype(change));
filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
-#ifdef ERROR_TEST
- if (fs_get_error(fsinfo->member, "COMMIT_ERROR")) {
- osync_context_report_error(ctx, OSYNC_ERROR_EXPECTED, "Triggering COMMIT_ERROR error");
- return FALSE;
- }
- if (fs_get_error(fsinfo->member, "COMMIT_TIMEOUT"))
- return FALSE;
-#endif
-
if (!fs_access(ctx, change))
return FALSE;
@@ -416,15 +347,6 @@
osync_debug("FILE-SYNC", 3, "start: %s", __func__);
filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
-#ifdef ERROR_TEST
- if (fs_get_error(fsinfo->member, "SYNC_DONE_ERROR")) {
- osync_context_report_error(ctx, OSYNC_ERROR_EXPECTED, "Triggering SYNC_DONE_ERROR error");
- return;
- }
- if (fs_get_error(fsinfo->member, "SYNC_DONE_TIMEOUT"))
- return;
-#endif
-
//osync_hashtable_forget(fsinfo->hashtable);
osync_anchor_update(fsinfo->member, "path", fsinfo->path);
osync_context_report_success(ctx);
@@ -436,15 +358,6 @@
osync_debug("FILE-SYNC", 3, "start: %s", __func__);
filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
-#ifdef ERROR_TEST
- if (fs_get_error(fsinfo->member, "DISCONNECT_ERROR")) {
- osync_context_report_error(ctx, OSYNC_ERROR_EXPECTED, "Triggering DISCONNECT_ERROR error");
- return;
- }
- if (fs_get_error(fsinfo->member, "DISCONNECT_TIMEOUT"))
- return;
-#endif
-
g_dir_close(fsinfo->dir);
osync_hashtable_close(fsinfo->hashtable);
osync_context_report_success(ctx);
@@ -465,31 +378,6 @@
g_free(fsinfo);
}
-#ifdef ERROR_TEST
-static osync_bool fs_is_available(OSyncError **error)
-{
- if (g_getenv("IS_NOT_AVAILABLE")) {
- osync_error_set(error, OSYNC_ERROR_GENERIC, "file-sync plugin is not available");
- return FALSE;
- }
- return TRUE;
-}
-
-static void fs_batch_commit(void *data, OSyncContext **contexts, OSyncChange **changes)
-{
- filesyncinfo *env = (filesyncinfo *)data;
- osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, env, contexts, changes);
- osync_trace(TRACE_EXIT, "%s", __func__);
-}
-
-static void fs_committed_all(void *data)
-{
- filesyncinfo *env = (filesyncinfo *)data;
- osync_trace(TRACE_ENTRY, "%s(%p)", __func__, env);
- osync_trace(TRACE_EXIT, "%s", __func__);
-}
-#endif
-
void get_info(OSyncPluginInfo *info)
{
info->name = "file-sync";
@@ -512,24 +400,4 @@
osync_plugin_set_access_objformat(info, "data", "file", fs_access);
osync_plugin_set_read_objformat(info, "data", "file", fs_read);
-#ifdef ERROR_TEST
- //Lets reduce the timeouts a bit so the checks work faster
- info->timeouts.disconnect_timeout = 5;
- info->timeouts.connect_timeout = 5;
- info->timeouts.sync_done_timeout = 5;
- info->timeouts.get_changeinfo_timeout = 5;
- info->timeouts.get_data_timeout = 5;
- info->timeouts.commit_timeout = 5;
-
- if (g_getenv("IS_AVAILABLE"))
- info->functions.is_available = fs_is_available;
-
- if (g_getenv("BATCH_COMMIT1"))
- osync_plugin_set_batch_commit_objformat(info, "data", "file", fs_batch_commit);
-
- if (g_getenv("BATCH_COMMIT2"))
- osync_plugin_set_committed_all_objformat(info, "data", "file", fs_committed_all);
-#endif
-
-
}
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/tests/Makefile.am 2005-03-22 16:26:20 UTC (rev 395)
@@ -85,3 +85,7 @@
clean:
rm -rf coverage/*
+ $(MAKE) clean -C mock-plugin
+
+all-local:
+ $(MAKE) -C mock-plugin
Modified: trunk/tests/check_codes.c
===================================================================
--- trunk/tests/check_codes.c 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/tests/check_codes.c 2005-03-22 16:26:20 UTC (rev 395)
@@ -6,9 +6,7 @@
g_setenv("INIT_NULL", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -38,9 +36,7 @@
g_setenv("CONNECT_ERROR", "3", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -75,9 +71,7 @@
g_setenv("CONNECT_ERROR", "1", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -113,9 +107,7 @@
g_setenv("CONNECT_ERROR", "5", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -151,9 +143,7 @@
g_setenv("CONNECT_ERROR", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -189,9 +179,7 @@
g_setenv("CONNECT_ERROR", "7", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -227,9 +215,7 @@
g_setenv("CONNECT_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -265,9 +251,7 @@
g_setenv("CONNECT_ERROR", "0", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -304,9 +288,7 @@
g_setenv("CONNECT_TIMEOUT", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -343,9 +325,7 @@
g_setenv("CONNECT_TIMEOUT", "3", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -382,9 +362,7 @@
g_setenv("CONNECT_TIMEOUT", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -422,9 +400,7 @@
g_setenv("CONNECT_TIMEOUT", "2", TRUE);
g_setenv("CONNECT_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -461,9 +437,7 @@
g_setenv("GET_CHANGES_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -502,9 +476,7 @@
g_setenv("GET_CHANGES_ERROR", "3", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -544,9 +516,7 @@
g_setenv("GET_CHANGES_ERROR", "5", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -584,9 +554,7 @@
g_setenv("GET_CHANGES_ERROR", "1", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -625,9 +593,7 @@
g_setenv("GET_CHANGES_TIMEOUT", "1", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -669,9 +635,7 @@
g_setenv("GET_CHANGES_TIMEOUT", "3", TRUE);
g_setenv("GET_CHANGES_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -711,9 +675,7 @@
g_setenv("GET_CHANGES_TIMEOUT2", "7", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -756,9 +718,7 @@
g_setenv("COMMIT_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -805,9 +765,7 @@
g_setenv("COMMIT_ERROR", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -854,9 +812,7 @@
g_setenv("COMMIT_TIMEOUT", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -903,9 +859,7 @@
g_setenv("COMMIT_TIMEOUT", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -953,9 +907,7 @@
g_setenv("COMMIT_TIMEOUT", "4", TRUE);
g_setenv("COMMIT_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1003,9 +955,7 @@
g_setenv("COMMIT_TIMEOUT", "2", TRUE);
g_setenv("COMMIT_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1050,9 +1000,7 @@
{
char *testbed = setup_testbed("multisync_easy_new");
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1108,9 +1056,7 @@
{
char *testbed = setup_testbed("multisync_easy_new");
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1168,9 +1114,7 @@
g_setenv("SYNC_DONE_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1218,9 +1162,7 @@
g_setenv("SYNC_DONE_ERROR", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1268,9 +1210,7 @@
g_setenv("SYNC_DONE_ERROR", "7", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1318,9 +1258,7 @@
g_setenv("SYNC_DONE_TIMEOUT", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1368,9 +1306,7 @@
g_setenv("SYNC_DONE_TIMEOUT", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1419,9 +1355,7 @@
g_setenv("SYNC_DONE_TIMEOUT", "5", TRUE);
g_setenv("SYNC_DONE_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1469,9 +1403,7 @@
g_setenv("DISCONNECT_ERROR", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1520,9 +1452,7 @@
g_setenv("DISCONNECT_ERROR", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1571,9 +1501,7 @@
g_setenv("DISCONNECT_ERROR", "7", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1622,9 +1550,7 @@
g_setenv("DISCONNECT_TIMEOUT", "4", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1673,9 +1599,7 @@
g_setenv("DISCONNECT_TIMEOUT", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1725,9 +1649,7 @@
g_setenv("DISCONNECT_TIMEOUT", "5", TRUE);
g_setenv("DISCONNECT_ERROR", "2", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -1778,9 +1700,7 @@
g_setenv("DISCONNECT_ERROR", "2", TRUE);
g_setenv("GET_CHANGES_TIMEOUT", "6", TRUE);
- OSyncEnv *osync = osync_env_new();
-
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
Modified: trunk/tests/check_env.c
===================================================================
--- trunk/tests/check_env.c 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/tests/check_env.c 2005-03-22 16:26:20 UTC (rev 395)
@@ -108,6 +108,7 @@
START_TEST (env_check_plugin_true1)
{
+ char *testbed = setup_testbed(NULL);
OSyncEnv *env = init_env();
OSyncError *error = NULL;
@@ -115,11 +116,13 @@
fail_unless(!osync_error_is_set(&error), NULL);
osync_env_free(env);
+ destroy_testbed(testbed);
}
END_TEST
START_TEST (env_check_plugin_true2)
{
+ char *testbed = setup_testbed(NULL);
g_setenv("IS_AVAILABLE", "1", TRUE);
OSyncEnv *env = init_env();
@@ -130,11 +133,13 @@
fail_unless(!osync_error_is_set(&error), NULL);
osync_env_free(env);
+ destroy_testbed(testbed);
}
END_TEST
START_TEST (env_check_plugin_false)
{
+ char *testbed = setup_testbed(NULL);
OSyncEnv *env = init_env();
OSyncError *error = NULL;
@@ -142,11 +147,13 @@
fail_unless(osync_error_is_set(&error), NULL);
osync_env_free(env);
+ destroy_testbed(testbed);
}
END_TEST
START_TEST (env_check_plugin_false2)
{
+ char *testbed = setup_testbed(NULL);
g_setenv("IS_AVAILABLE", "1", TRUE);
g_setenv("IS_NOT_AVAILABLE", "1", TRUE);
@@ -158,6 +165,7 @@
fail_unless(osync_error_is_set(&error), NULL);
osync_env_free(env);
+ destroy_testbed(testbed);
}
END_TEST
Modified: trunk/tests/check_filter.c
===================================================================
--- trunk/tests/check_filter.c 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/tests/check_filter.c 2005-03-22 16:26:20 UTC (rev 395)
@@ -3,9 +3,8 @@
START_TEST (filter_setup)
{
char *testbed = setup_testbed("filter_setup");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
+
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -32,9 +31,7 @@
START_TEST (filter_flush)
{
char *testbed = setup_testbed("filter_setup");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -63,9 +60,7 @@
START_TEST (filter_sync_deny_all)
{
char *testbed = setup_testbed("filter_sync_deny_all");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -94,9 +89,7 @@
START_TEST (filter_sync_custom)
{
char *testbed = setup_testbed("filter_sync_custom");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -199,9 +192,7 @@
START_TEST (filter_sync_vcard_only)
{
char *testbed = setup_testbed("filter_sync_vcard_only");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
@@ -239,9 +230,7 @@
/* Check if the destobjtype of the changes is being
* set when the change type os DELETE */
char *testbed = setup_testbed("destobjtype_delete");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
- mark_point();
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
fail_unless(group != NULL, NULL);
mark_point();
Modified: trunk/tests/check_multisync.c
===================================================================
--- trunk/tests/check_multisync.c 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/tests/check_multisync.c 2005-03-22 16:26:20 UTC (rev 395)
@@ -28,9 +28,9 @@
fail_unless(num_engine_end_conflicts = 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -88,9 +88,9 @@
fail_unless(num_read == 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -150,9 +150,9 @@
fail_unless(num_engine_end_conflicts = 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -212,9 +212,9 @@
fail_unless(num_engine_end_conflicts = 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -257,9 +257,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -326,9 +326,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -536,9 +536,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -609,9 +609,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -688,9 +688,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -818,9 +818,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -942,12 +942,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -970,9 +970,9 @@
synchronize_once(engine, NULL);
maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 1);
@@ -1043,15 +1043,15 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata-dupe-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata-dupe-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata-dupe-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata-dupe-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata-dupe-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata-dupe-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 3);
@@ -1077,9 +1077,9 @@
synchronize_once(engine, NULL);
maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 1);
@@ -1155,9 +1155,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -1235,9 +1235,9 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, 0, 3, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, 0, 3, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -1314,12 +1314,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -1386,15 +1386,15 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 3);
@@ -1443,21 +1443,21 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
maptable = mappingtable_load(group, 5, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1-dupe", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2-dupe", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1-dupe", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2-dupe", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2-dupe", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 5);
@@ -1533,15 +1533,15 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 3);
@@ -1590,15 +1590,15 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata2", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata2", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata2", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata2", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 3);
@@ -1667,12 +1667,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -1718,12 +1718,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 2);
@@ -1751,12 +1751,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 2);
@@ -1786,12 +1786,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 2);
@@ -1860,11 +1860,11 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" != \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -1894,12 +1894,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data3)\" = \"x\""), NULL);
maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 3, "testdata1", "file", "data");
- check_mapping(maptable, 3, -1, 3, "testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 3, "testdata1", "mockformat", "data");
+ check_mapping(maptable, 3, -1, 3, "testdata1", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 2);
Modified: trunk/tests/check_sync.c
===================================================================
--- trunk/tests/check_sync.c 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/tests/check_sync.c 2005-03-22 16:26:20 UTC (rev 395)
@@ -32,8 +32,9 @@
OSyncEngine *engine = osync_engine_new(group, NULL);
osync_engine_set_memberstatus_callback(engine, member_status, NULL);
- osync_engine_init(engine, NULL);
- synchronize_once(engine, NULL);
+ OSyncError *error = NULL;
+ osync_engine_init(engine, &error);
+ synchronize_once(engine, &error);
osync_engine_finalize(engine);
osync_engine_free(engine);
@@ -84,8 +85,8 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
check_hash(table, "testdata");
@@ -191,8 +192,8 @@
fail_unless(num_written == 0, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -226,10 +227,10 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 2, 0);
- check_mapping(maptable, 1, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 2, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 2, "testdata-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 2);
@@ -253,8 +254,8 @@
fail_unless(num_conflicts == 0, NULL);
maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 1);
@@ -287,12 +288,12 @@
fail_unless(!system("test \"x$(diff -x \".*\" data1 data2)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 1, -1, 2, "testdata-dupe", "file", "data");
- check_mapping(maptable, 1, -1, 2, "testdata-dupe-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata-dupe", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata-dupe-dupe", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata-dupe-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata-dupe", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata-dupe-dupe", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 3);
@@ -315,8 +316,8 @@
fail_unless(num_conflicts == 0, NULL);
maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
table = hashtable_load(group, 1, 1);
@@ -359,8 +360,8 @@
fail_unless(num_conflicts == 1, NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 1, 0);
- check_mapping(maptable, 1, 0, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, 0, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, 0, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, 0, 2, "testdata", "mockformat", "data");
mappingtable_close(maptable);
OSyncHashTable *table = hashtable_load(group, 1, 1);
@@ -514,8 +515,7 @@
START_TEST (sync_easy_dualdel)
{
char *testbed = setup_testbed("sync_easy_dualdel");
- OSyncEnv *osync = osync_env_new();
- osync_env_initialize(osync, NULL);
+ OSyncEnv *osync = init_env();
OSyncGroup *group = osync_group_load(osync, "configs/group", NULL);
OSyncError *error = NULL;
@@ -551,7 +551,8 @@
}
END_TEST
-START_TEST (sync_subdirs_new)
+//This cannot work with the mock plugin
+/*START_TEST (sync_subdirs_new)
{
char *testbed = setup_testbed("sync_subdirs_new");
OSyncEnv *osync = init_env();
@@ -576,14 +577,14 @@
fail_unless(!system("test \"x$(diff -x \".*\" -r data1 data2)\" = \"x\""), NULL);
OSyncMappingTable *maptable = mappingtable_load(group, 3, 0);
- check_mapping(maptable, 1, -1, 2, "testdata", "file", "data");
- check_mapping(maptable, 2, -1, 2, "testdata", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "testdata", "mockformat", "data");
- check_mapping(maptable, 1, -1, 2, "subdir/testdata", "file", "data");
- check_mapping(maptable, 2, -1, 2, "subdir/testdata", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "subdir/testdata", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "subdir/testdata", "mockformat", "data");
- check_mapping(maptable, 1, -1, 2, "subdir/testdata1", "file", "data");
- check_mapping(maptable, 2, -1, 2, "subdir/testdata1", "file", "data");
+ check_mapping(maptable, 1, -1, 2, "subdir/testdata1", "mockformat", "data");
+ check_mapping(maptable, 2, -1, 2, "subdir/testdata1", "mockformat", "data");
mappingtable_close(maptable);
@@ -625,7 +626,7 @@
destroy_testbed(testbed);
}
-END_TEST
+END_TEST*/
Suite *env_suite(void)
{
@@ -646,7 +647,7 @@
create_case(s, "sync_moddel", sync_moddel);
create_case(s, "sync_conflict_moddel", sync_conflict_moddel);
create_case(s, "sync_conflict_duplicate", sync_conflict_duplicate);
- create_case(s, "sync_subdirs_new", sync_subdirs_new);
+ //create_case(s, "sync_subdirs_new", sync_subdirs_new);
return s;
}
Modified: trunk/tests/check_vcard.c
===================================================================
--- trunk/tests/check_vcard.c 2005-03-22 16:20:29 UTC (rev 394)
+++ trunk/tests/check_vcard.c 2005-03-22 16:26:20 UTC (rev 395)
@@ -2,6 +2,12 @@
static void conv_vcard(const char *filename, const char *extension)
{
+ ...
[truncated message content] |
