From b0c45cfc8997e5f6021609de9c00c0394c734aaf Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Tue, 8 Nov 2016 11:13:19 +0100 Subject: Test: Don't fail when DST change is near #5284 --- test/testutility.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/testutility.cpp') diff --git a/test/testutility.cpp b/test/testutility.cpp index 16fd3066b..cf88acde3 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -80,7 +80,7 @@ private slots: quint64 sec = 1000; quint64 hour = 3600 * sec; - QDateTime current = QDateTime::currentDateTime(); + QDateTime current = QDateTime::currentDateTimeUtc(); QCOMPARE(durationToDescriptiveString2(0), QString("0 second(s)") ); QCOMPARE(durationToDescriptiveString2(5), QString("0 second(s)") ); -- cgit v1.2.3 From a1dc4069c99757447f27f4a9b6a338fbe7700bb4 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 15 Nov 2016 18:47:04 +0100 Subject: libsync: Don't store the remote URI in the csync or in the SyncEngine We are going to change the webdav path depending on the capabilities. But the SyncEngine and csync might have been created before the capabilities are retrieved. The main raison why we gave the path to the sync engine was to pass it to csync. But the thing is that csync don't need anymore this url as everything is done by the discovery classes in libsync that use the network jobs that use the account for the urls. So csync do not need the remote URI. shortenFilename in folderstatusmodel.cpp was useless because the string is the _file of a SyncFileItem which is the relative file name, that name never starts with owncloud://. All the csync test creates the folder because csync use to check if the folder exists. But we don't need to do that anymore --- test/testutility.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'test/testutility.cpp') diff --git a/test/testutility.cpp b/test/testutility.cpp index cf88acde3..ba5248474 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -64,14 +64,6 @@ private slots: QVERIFY(hasLaunchOnStartup(appName) == false); } - void testToCSyncScheme() - { - QVERIFY(toCSyncScheme("http://example.com/owncloud/") == - "owncloud://example.com/owncloud/"); - QVERIFY(toCSyncScheme("https://example.com/owncloud/") == - "ownclouds://example.com/owncloud/"); - } - void testDurationToDescriptiveString() { QLocale::setDefault(QLocale("C")); -- cgit v1.2.3