build, lib/model: Add flag to run tests without -short and fix failure (#7716)

2021-05-28 22:20:18 +02:00
parent fbaf696821
commit fcb19518c7
2 changed files with 12 additions and 3 deletions
@@ -1472,9 +1472,9 @@ func (m *model) ccCheckEncryption(fcfg config.FolderConfiguration, folderDevice

 	if !(hasTokenRemote || hasTokenLocal) {
 		if isEncryptedRemote {
-			return errEncryptionPlainForReceiveEncrypted
-		} else {
 			return errEncryptionPlainForRemoteEncrypted
+		} else {
+			return errEncryptionPlainForReceiveEncrypted
 		}
 	}