Commit graph

59 commits

Author SHA1 Message Date
Olivier Goffart
2afdc9d095 Adapt to new multybyte api after merge
(Search and replace)
2013-08-18 16:43:46 +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
Andreas Schneider
4a87a1ee35 tests: Package testfiles as xz archive. 2013-08-01 17:08:19 +02:00
Klaas Freitag
fafc9bc11a tests: Moved all ownCloud testfiles into tarball.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-08-01 16:47:56 +02:00
Olivier Goffart
af7e36422e Add ignore files that need cleanup
Add the possibility to ignore files but specify they should be deleted
if the directory is deleted.
2013-07-29 15:03:25 +02:00
Olivier Goffart
7a8b07443f Fix cases where the file has been replaced by another with the same mtime
IL issue 169
2013-07-23 16:03:50 +02:00
Klaas Freitag
a390444666 tests: Removed unused test file.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-23 07:34:47 +02:00
Klaas Freitag
7417d6a830 tests: Modularize ownCloud's integration test script.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-23 07:33:32 +02:00
Klaas Freitag
af3beca746 tests: Added test data for the owncloud integration test script.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-23 07:32:01 +02:00
Olivier Goffart
73ef2c1b6f Do RENAMES before any PUT
In order to fix mirall issue #731
where one rename a file then re-create the original
2013-07-09 16:29:03 +02:00
Olivier Goffart
ed76e5f1f2 Fix conflict file appearing when a file cannot be stated
We still need to fetch the md5 from the database to be able to store it
back.
2013-06-13 15:06:35 +02:00
Klaas Freitag
ad7aac4152 Rather use eq and ne for string comparison. 2013-05-16 16:12:27 +02:00
Daniel Molkentin
b9c7980433 Work on non-mac again 2013-05-16 15:00:52 +02:00
Daniel Molkentin
ecff867e46 Get further on mac 2013-05-16 13:02:51 +02:00
Klaas Freitag
4af8f470e8 Check the stat result. 2013-05-16 12:46:06 +02:00
Olivier Goffart
5c79d8bdef t3.pl: test renaming folder
Add a test to test that renaming folder and doing complex stuff in them
works
2013-05-15 17:59:13 +02:00
Daniel Molkentin
6b4501fd4b Try to make t1 utf-8-mac safe 2013-05-15 17:57:19 +02:00
Klaas Freitag
551d457c7c Pulled Test.pm out of t1.pl for reuse. Simplified t1.pl. 2013-05-15 11:15:50 +02:00
Klaas Freitag
eb2997e609 Normalized UTF-8 and createLocalFile added. 2013-05-14 17:46:35 +02:00
Klaas Freitag
ae1541a95f Dependency info added. 2013-05-14 16:32:36 +02:00
Klaas Freitag
f56a075f36 Create directories vio mkcol and do not compare dir sizes. 2013-05-14 16:01:57 +02:00
Olivier Goffart
41a56b19b7 t1.pl: let configure csync command 2013-05-10 12:45:51 +02:00
Klaas Freitag
9d84c19b69 Reworked integration test: File assert traversal fixed. 2013-05-09 13:26:28 +02:00
Klaas Freitag
b1f62b51bf Add owncloud module files to build. 2013-05-09 13:26:28 +02:00
Olivier Goffart
247f4d948c don't ajust the time anymore with the difference from client to server 2013-05-07 11:45:02 +02:00
Klaas Freitag
4f396c4562 Testfile added. 2013-04-26 17:41:55 +02:00
Klaas Freitag
2b971a09f3 Make httpbf tests functional. 2013-04-17 15:21:38 +02:00
Klaas Freitag
08d439129c Fix some documentation in the code 2013-04-03 16:39:04 +02:00
Klaas Freitag
34668e42b3 Merge branch 'dav_0.70.5' into dav - WIP
Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	src/csync.h
	src/csync_update.c
	tests/ownCloud/t1.pl
2013-04-02 14:44:01 +02:00
Klaas Freitag
466faba761 Fix test script. 2013-03-26 10:06:00 +01:00
Klaas Freitag
8b229f6413 Minor fixups. 2013-03-22 10:22:50 +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
Daniel Molkentin
9c0c693081 Add iconv support to convert charsets to different platforms. 2013-02-06 15:11:40 +01:00
Olivier Goffart
e75f11b87a Use httpbf in owncloud 2013-01-29 16:23:28 +01:00
Daniel Molkentin
49d2fd685b iconv support
This allows for files on mac to automatically be converted to UNC
2012-12-07 13:03:01 +01:00
Olivier Goffart
f946dd4287 Owncloud: cache the last PROPFIND call.
So we do not need to have two calls (stat+opendir)
2012-12-05 14:49:50 +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
8633d7751a Fix test script to work with ocsync. 2012-10-16 11:53:20 +02:00
Klaas Freitag
99691059bf Removed all usage of openSSL. 2012-08-29 15:37:31 +03:00
Klaas Freitag
4e4fca54c2 added test data as well as a test config template. 2012-08-29 15:26:31 +03:00
Klaas Freitag
52e0f06692 use a more speaking name for config file. 2012-08-29 15:26:15 +03:00
Klaas Freitag
b6edf82d4e Fixed license of tests, added dir check test. 2012-08-26 20:08:28 +02:00
Klaas Freitag
4169c4be05 More blackbox testing of csync ownCloud - enhanced test script. 2012-08-23 17:57:04 +03:00
Klaas Freitag
8e401e662f MD5 Support WIP 2012-08-23 17:34:19 +03:00
Klaas Freitag
459f25b0ef owncloud test: Save the downloaded file in /tmp. 2012-07-19 21:04:15 +02:00
Klaas Freitag
2b4261f15a Added functions to generate MD5-Sums based on openssl with tests. 2012-07-18 17:00:46 +02:00
Klaas Freitag
5f93c490a5 Make ownCloud cmocka test build on the win32 platform. 2012-07-11 18:01:08 +02:00
Klaas Freitag
b74fc47e3f More unit testing of the ownCloud module with mocka. 2012-07-11 16:50:25 +02:00
Klaas Freitag
7b261077a2 Avoid compile warning and use an unsigned variable. 2012-07-09 14:45:25 +02:00
Klaas Freitag
5b79f1feca Added mocka tests for the ownCloud module. 2012-07-09 14:16:20 +02:00