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
Olivier Goffart
eab488e64f
compile after merge
2014-09-18 19:58:04 +02:00
Olivier Goffart
50e718b1e7
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
Daniel Molkentin
fe023e2229
Allow passing user/pass explicitly or via netrc
...
#2211
2014-09-16 23:52:28 +02:00
Daniel Molkentin
2c6324e3e5
Fix tests
2014-08-27 10:27:29 +02:00
Daniel Molkentin
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
Klaas Freitag
8d819956d3
Tests: Fixed the CSync statedb test defined in the mirall module.
2014-08-15 18:33:04 +02:00
Daniel Molkentin
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
Olivier Goffart
d3b599b727
Fix build of the test on Qt5
2014-07-10 10:42:02 +02:00
Olivier Goffart
45d1567057
Move Folder, FolderMan, and FolderWatcher outside of owncloudsync
...
Those class are maintaining the folder for the mirall configuration
They are not usefull in command line clients
Also the FolderWatcher is only used by the folder and not used by the
command line clients
2014-07-09 22:44:08 +02:00
Markus Goetz
b48ab79a92
CSync & statedb: Remove uid/gid
...
Columns are still in the DB as we don't want to break any compatibility.
2014-06-06 13:41:16 +02:00
Klaas Freitag
87386ce001
Fix testcase.
...
It failed because the directory where change happened triggered a
notification within the second before, so the event was skipped.
2014-05-14 12:49:11 +02:00
hefee
822650719b
RemoveADir test should realy test, if it is notified
2014-05-11 17:08:30 +02:00
Olivier Goffart
5bceb6f787
fix test compilation
2014-03-28 11:02:18 +01:00
Olivier Goffart
98d7ff5116
Don't create .ctmp of sync journal
...
Fixes #1559
2014-03-26 10:25:50 +01:00
Klaas Freitag
d2e1923694
Fix compile warning.
2014-03-20 12:57:57 +01:00
Klaas Freitag
39924d79cb
Add new test to test the csync database code.
2014-03-20 11:15:28 +01:00
Olivier Goffart
1e43d1fa49
Add missing license headers in tests
...
LGPL for csync tests, GPL for mirall tests
2014-02-24 11:08:58 +01:00
Daniel Molkentin
086694f284
Fix Qt5: Tests require Xml Module
2014-02-04 13:12:13 +01:00
Daniel Molkentin
ff569603f5
Updater: More tests
2014-01-29 12:01:35 +01:00
