Skip to content

Commit

Permalink
Test: Fix testsyncvirtualfiles test
Browse files Browse the repository at this point in the history
Like previous commit, the failure was caused by two conflicting commits
  • Loading branch information
ogoffart committed Oct 30, 2019
1 parent 79e9168 commit 60d28c4
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions test/testsyncvirtualfiles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit 60d28c4

Please sign in to comment.