Olivier Goffart
6b27d2e703
Merge remote-tracking branch 'origin/1.8'
2015-05-26 12:28:31 +02:00
Olivier Goffart
6b9e123816
Merge remote-tracking branch 'origin/checksum_1.8' into 1.8
2015-05-22 10:32:37 +02:00
Christian Kamm
1c84d01584
Windows: Fix build of tests.
2015-05-22 09:17:24 +02:00
Klaas Freitag
8f277e46d6
TransmissionChecksumming: Remove SyncFileItem dependency.
2015-05-21 15:51:48 +02:00
Klaas Freitag
64ce0cd7a2
Improved implementation efficiency of checksum calculation.
...
Based on Oliviers suggestions the file read routine now reuses
one buffer to read the entire file.
Other cleanups.
2015-05-20 21:42:08 +02:00
Klaas Freitag
4d87f30434
Transmission checksum: Adopt unit test to latest changes.
2015-05-19 17:09:40 +02:00
Klaas Freitag
830daa40d1
Add a class TransmissionChecksumValidator, incl. unit test.
...
This does all needed to manage checksums that go with http headers
ensuring that the transmission was correct.
2015-05-19 17:09:40 +02:00
Klaas Freitag
823f9fa0d1
Checksum Calculation: Add unit test.
2015-05-19 17:09:39 +02:00
Markus Goetz
ac0e08cc91
Merge branch '1.8' into 1.9
2015-05-12 23:02:58 +02:00
Markus Goetz
bcc896fb6e
Qt4: Fix test
2015-05-12 22:55:54 +02:00
Daniel Molkentin
a36df4aa4b
Merge remote-tracking branch 'origin/1.8' into 1.9
2015-05-12 09:57:22 +02:00
Markus Goetz
625e61516f
Propagator: Limit length of temporary file name #2789 (fixup)
...
Fix 22c35c4d15
2015-05-11 15:42:35 +02:00
Markus Goetz
22c35c4d15
Propagator: Limit length of temporary file name #2789
2015-05-08 16:42:03 +02:00
Markus Goetz
0359c775e0
Discovery: Test better, treat invalid hrefs as error #3176
2015-05-07 17:19:48 +02:00
Daniel Molkentin
77a28a81eb
Bump to 1.9
2015-05-06 17:01:05 +02:00
Markus Goetz
2866e56c51
LsColXMLParser: More testing 2
2015-04-14 14:56:25 +02:00
Markus Goetz
2074bdbb19
LsColXMLParser: More testing
2015-04-14 14:41:48 +02:00
Klaas Freitag
d212ac7d16
test xmlparser: Verify call to parse()
2015-04-14 13:45:09 +02:00
Klaas Freitag
d2bae21b14
Added unit test for XML Parser class.
2015-04-14 13:43:05 +02:00
Christian Kamm
0464947610
Remove extra ; to silence warning.
2015-02-25 07:14:05 +01:00
Olivier Goffart
193fca4a8b
SyncFileItem::operator<: must return false when two items are equal
...
Fixes #2852
2015-02-18 12:41:06 +01:00
Olivier Goffart
04bb67ef45
Fix Qt4 build
...
The automatic registration of metatype only came with qt5
2015-02-13 21:41:09 +01:00
Christian Kamm
40dbc78407
concatUrl: Remove manual parsing, add test. #2817
2015-02-13 14:53:55 +01:00
Klaas Freitag
4710609cb9
Tests: Removed C++11 Hokuspokus to not confuse and kill elderly compilers.
2015-02-13 11:07:53 +01:00
Olivier Goffart
b9161aa06c
libsync: Fix a case in which canceling the sync would result in some folder never being sync'ed
...
The problem occurs because of the sorting of items when we have things like
bigfolder
bigfolder/bigsubfolder
bigfolder-2
Then, because dashes come before slash in ascii, the bigfolder-2 would come before its content
and the propagator would thinkg bigfolder is empty and save the etag before it is processed
Should fix issue #2832
2015-02-12 20:00:04 +01:00
Elan Ruusamäe
e0656af1fc
use touch from path
...
on some systems touch(1) is in /bin, not /usr/bin.
instead hardcoding another path, take it from $PATH, like other commands used here (rm, echo)
2015-02-08 01:27:46 +02:00
Daniel Molkentin
9a4f4854de
Some fixes for favlink manual test
2015-02-06 15:29:36 +01:00
Olivier Goffart
907b79d3b8
Utility: Use appropriate unit when converting from bytes to human readable units
...
We must not use the SI units if we use power of 2
I believe that we should use SI units and power of 10
But since the server still use power of 2, we need to show the same numbers
But at least we use the proper standard IEC unit that are explicit
2015-01-15 14:06:17 +01:00
Olivier Goffart
863731fd6a
Revert "Utility: Use SI units"
...
This reverts commit 7445fa7ef7f654c53c35
2015-01-15 13:56:51 +01:00
Olivier Goffart
f654c53c35
fixing testOctetsToString
2015-01-15 09:58:40 +01:00
Christian Kamm
53d5de685c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
Christian Kamm
40f44c2389
DB: Delete corrupt database. #2547
...
* Also use readonly DB access for SocketAPI.
2014-12-04 15:35:55 +01:00
Daniel Molkentin
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
Olivier Goffart
1c58b75ac2
Merge branch '1.7'
2014-11-21 11:08:20 +01:00
Christian Kamm
e3b07f569a
FolderWatcherTest: Use Utility::usleep.
2014-11-21 08:21:36 +01:00
Christian Kamm
6d09f1b6c0
Folder watcher now reports changing paths instead of dirs.
2014-11-20 12:51:16 +01:00
Christian Kamm
f275002ebe
Merge branch '1.7'
2014-11-20 12:41:06 +01:00
Christian Kamm
d4e0941c27
Windows filewatcher: switch to ReadDirectoryChangesW.
...
Based on danimo's #2454 fix for #2455 and related to #2297 .
2014-11-20 12:36:17 +01:00
Christian Kamm
4d7b8bdb25
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
OWNCLOUD.cmake
test/CMakeLists.txt
test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
Christian Kamm
421a8cc6b7
Windows: Make unit tests compile.
2014-11-19 14:18:37 +01:00
Daniel Molkentin
1297ac77b9
Fix tests
2014-11-09 22:37:56 +01:00
Christian Kamm
4e20a02fe5
SyncJournalDB: Add filesize column to metadata.
...
* Alter table to include column.
* Make get/set in SyncJournalDB store and load it.
* Make csync recover the stat_t's size member from it.
2014-10-29 09:53:36 +01:00
Daniel Molkentin
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
Klaas Freitag
b691521662
tests: Fix CSync Journal test, use real CSYNC struct from csync_private.
...
This fixes bug #2396
2014-10-27 13:15:33 +01:00
Christian Kamm
e5269a4151
Add SyncJournalDB autotests.
...
There also was a bug in syncjournaldb: in some error conditions the
sql query wasn't reset properly. We now always reset a query before
calling bindValue.
2014-10-23 15:15:47 +02:00
Christian Kamm
7ae0338f5c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/socketapi.h
src/libsync/syncengine.h
test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
Klaas Freitag
2f740fe471
tests: Added unicode read an write testcase for ownsql.
2014-10-16 21:21:47 +02:00
Klaas Freitag
0094c1ecf5
Make the sync work with new sql implementation.
2014-10-14 20:51:51 +02:00
Klaas Freitag
6b5fcf53eb
Test module for the new sql implementation.
2014-10-14 20:51:34 +02:00
Olivier Goffart
d7d241196e
tests: add the source dir in the include paths
2014-09-22 08:58:35 +02:00
