Commit graph

117 commits

Author SHA1 Message Date
Klaas Freitag
4cc1ef3624 Merge remote-tracking branch 'freitag/dav' into ocsync
Conflicts:
	src/csync_propagate.c
	src/csync_statedb.c
2013-09-04 15:51:38 +02:00
Klaas Freitag
d65b9aa404 Fixed exclude test. 2013-09-03 15:15:14 +02:00
Olivier Goffart
b4efcf1627 Compile the tests after merge
(Still not passing)
2013-08-18 19:11:36 +02:00
Markus Goetz
b923554935 Revert "DB: Don't use metadata_tmp table"
Let's not do this in the release branch

This reverts commit 79f72a1211.
2013-08-18 17:13:19 +02:00
Markus Goetz
79f72a1211 DB: Don't use metadata_tmp table
Not sure why this was ever needed
2013-08-18 17:05:04 +02:00
Olivier Goffart
b5ed352aa3 Merge remote-tracking branch 'origin/master' into ocsync
Only confluct resolution, do not compile or works

Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	ConfigureChecks.cmake
	client/csync_client.c
	cmake/Modules/DefineCompilerFlags.cmake
	cmake/Modules/DefineInstallationPaths.cmake
	cmake/Modules/FindIconv.cmake
	cmake/Modules/FindIniparser.cmake
	cmake/Modules/FindNeon.cmake
	config.h.cmake
	config/CMakeLists.txt
	config/ocsync.conf
	doc/CMakeLists.txt
	modules/csync_owncloud.c
	modules/csync_sftp2.c
	src/CMakeLists.txt
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_exclude.c
	src/csync_lock.c
	src/csync_macros.h
	src/csync_misc.c
	src/csync_misc.h
	src/csync_private.h
	src/csync_propagate.c
	src/csync_statedb.c
	src/csync_statedb.h
	src/csync_update.c
	src/csync_util.c
	src/csync_util.h
	src/std/c_dir.c
	src/std/c_file.c
	src/std/c_private.h
	src/std/c_string.c
	src/std/c_string.h
	src/std/c_time.c
	src/vio/csync_vio.c
	src/vio/csync_vio.h
	src/vio/csync_vio_file_stat.h
	src/vio/csync_vio_local.c
	src/vio/csync_vio_method.h
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_treewalk.c
	tests/csync_tests/check_csync_update.c
	tests/ownCloud/HTTP/DAV.pm
	tests/ownCloud/ownCloud/Test.pm
	tests/std_tests/check_std_c_str.c
	tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Daniel Molkentin
444946ae79 Fix update test 2013-08-07 16:58:29 +02:00
Klaas Freitag
26c0bbd0eb open test db in test correctly. 2013-08-07 15:39:30 +02:00
Klaas Freitag
0191fa43e0 Fix tests after statedb_open had moved. 2013-08-07 12:43:32 +02:00
Daniel Molkentin
d9b34121ae Fix OS X build with -Werror 2013-07-31 14:50:44 +02:00
Andreas Schneider
acf3dc6aff config: Implement a new config parser. 2013-07-28 23:16:04 +02:00
Klaas Freitag
570566d1de tests: Use correct setup method for ftw check.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-24 16:07:12 +02:00
Andreas Schneider
1bae4f4dd4 Revert "CID 1033194: Fix resource leak in stateedb test."
This reverts commit c40a3844e0.

There is no leak and we expect it to be NULL. Since we fork here, it
doesn't matter if we leak memory in this case.
2013-07-13 08:57:56 +02:00
Klaas Freitag
5d731f7530 CID 1033193: Fix resource leaks in statedb test.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-12 12:05:38 +02:00
Klaas Freitag
c40a3844e0 CID 1033194: Fix resource leak in stateedb test.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-12 12:03:51 +02:00
Olivier Goffart
52c7ff415e Fix the test
After commit a25fbb6160, we re compute the
hash before insterint into the db.  Which means that the test need to
have different paths in order to succeed
2013-07-10 12:15:53 +02:00
Andreas Schneider
bd6608a33d tests: Refactor treewalk test. 2013-07-04 15:11:26 +02:00
Andreas Schneider
cd23f8d2d1 CID 1033195: Fix resource leak. 2013-07-04 11:57:31 +02:00
Andreas Schneider
bd6a66d51e tests: Fix a resource leak. 2013-07-04 11:55:55 +02:00
Klaas Freitag
f8e31b95b1 tests: Remove the db before db_none test to meet the test condition. 2013-07-04 11:34:43 +02:00
Andreas Schneider
8953ed544c statedb: Remove context where it isn't needed. 2013-07-04 10:29:48 +02:00
Andreas Schneider
d05b077851 statedb: Always pass down the db pointer. 2013-07-04 10:29:19 +02:00
Klaas Freitag
ce6cf57a29 Make test work again by not writing the db. 2013-07-04 10:28:55 +02:00
Klaas Freitag
72cc0f5d7c Fixed testcase. 2013-06-10 11:48:38 +02:00
Klaas Freitag
ae5847138c Fix test cases for the new database code. 2013-06-07 16:09:22 +02:00
Klaas Freitag
e4b9f21f81 Fix statedb load test case. 2013-05-22 16:51:09 +02:00
Klaas Freitag
f2669ae886 Fix statedb-query test. 2013-05-22 16:43:31 +02:00
Andreas Schneider
9409d1c96e If there is no vio commit function don't fail. 2013-04-24 14:35:19 +02:00
Klaas Freitag
3b6d1cab91 Test for csync_commit 2013-04-24 14:21:51 +02:00
Klaas Freitag
f4ee205fe9 Minor code cleanups, warning avoidings and indentation.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
aada909836 Use multibyte character in file system functions.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-04-05 17:40:21 +02:00
Klaas Freitag
2cc291c520 tests: Add treewalk test.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-03-08 15:55:03 +01:00
Klaas Freitag
87c313485b tests: Treewalk function unit tests added.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-03-08 15:55:03 +01:00
Andreas Schneider
457086c63e tests: Apply changes to the logging system. 2013-03-01 10:06:06 +01:00
Klaas Freitag
41021d58d5 tests: Ported more tests to be cross platform capable.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-02-07 12:59:33 +01:00
Andreas Schneider
c795010988 log: Use a thread local variable for logging callback. 2012-12-18 14:25:35 +01:00
Andreas Schneider
9a539526f1 log: Use a thread local variable for the log level. 2012-12-17 09:40:17 +01:00
Olivier Goffart
95edd6a9de Merge remote-tracking branch 'origin/master' into dav
Conflicts:
	config/ocsync_log.conf
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_log.h
	src/csync_private.h
	src/csync_statedb.c
	tests/csync_tests/check_csync_config.c
2012-12-03 17:32:08 +01:00
Klaas Freitag
f90550775c Fixed tests to also run on debian host 2012-11-23 12:51:01 +01:00
Klaas Freitag
3fcc56ebbc Add removal of a test dir 2012-11-23 11:43:39 +01:00
Klaas Freitag
1147e77d67 Fix delete in csync_config 2012-11-23 11:26:24 +01:00
Klaas Freitag
d5a32543ef Fix update test. 2012-11-09 17:24:17 +01:00
Klaas Freitag
7aeeeae037 Fix test, avoid double free. 2012-11-09 17:16:27 +01:00
Andreas Schneider
2752a9e9c0 tests: Remove the right directory in the teardown function. 2012-10-30 14:49:18 +01:00
Andreas Schneider
e3e00b4b32 tests: Add a csync_log test. 2012-10-30 11:39:51 +01:00
Andreas Schneider
8a0b4319d3 csync: Add a new logging system. 2012-10-30 11:27:21 +01:00
Klaas Freitag
2bb52ef6f9 Merge branch 'master' into dav - get cmocka tests and database move.
Conflicts:
	CMakeLists.txt
	cmake/Modules/FindCMocka.cmake
	src/csync.c
	src/csync_exclude.c
	src/csync_reconcile.c
	src/csync_statedb.c
	src/csync_update.c
	src/csync_util.c
	src/vio/csync_vio.c
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_exclude.c
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_update.c
	tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Klaas Freitag
9e4c873b16 Fixed csync testcases. 2012-10-26 21:33:13 +02:00
Andreas Schneider
e43466d09d tests: Add exclude test for journal db names. 2012-10-22 15:13:52 +02:00
Klaas Freitag
01a25db3fb exclude: Fix checking the exclude pattern for subdirs.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-10-22 12:26:35 +02:00