Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2019-10-30 20:25:52 +0300
committerOlivier Goffart <ogoffart@woboq.com>2019-10-30 20:26:16 +0300
commit60d28c44be72ab9d4ae0b3422f24a294646f8bd6 (patch)
treeb5af57c335484eed7742bbe40e4f4fdad92f9884 /test
parent79e9168beb26ba2e1d77f6a9f336b85f6bc1f23f (diff)
Test: Fix testsyncvirtualfiles test
Like previous commit, the failure was caused by two conflicting commits
Diffstat (limited to 'test')
-rw-r--r--test/testsyncvirtualfiles.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/testsyncvirtualfiles.cpp b/test/testsyncvirtualfiles.cpp
index a1af6cfb9..647890feb 100644
--- a/test/testsyncvirtualfiles.cpp
+++ b/test/testsyncvirtualfiles.cpp
@@ -1135,9 +1135,8 @@ private slots:
QVERIFY(!fakeFolder.currentLocalState().find("A/file4" DVSUFFIX DVSUFFIX));
QVERIFY(itemInstruction(completeSpy, "A/file1" DVSUFFIX, CSYNC_INSTRUCTION_NEW));
QVERIFY(itemInstruction(completeSpy, "A/file2" DVSUFFIX, CSYNC_INSTRUCTION_NEW));
- QVERIFY(itemInstruction(completeSpy, "A/file3" DVSUFFIX, CSYNC_INSTRUCTION_NEW));
- QVERIFY(itemInstruction(completeSpy, "A/file4" DVSUFFIX, CSYNC_INSTRUCTION_NEW));
- // technically file3.owncloud and file4.owncloud are also ignored
+ QVERIFY(itemInstruction(completeSpy, "A/file3" DVSUFFIX, CSYNC_INSTRUCTION_IGNORE));
+ QVERIFY(itemInstruction(completeSpy, "A/file4" DVSUFFIX, CSYNC_INSTRUCTION_IGNORE));
QVERIFY(itemInstruction(completeSpy, "A/file4" DVSUFFIX DVSUFFIX, CSYNC_INSTRUCTION_IGNORE));
cleanup();