haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6262 from duplicati/feature/fix-dbtool-tests-should-fail

Browse Source 
Check exit code in dbtool tests
This commit is contained in:
Kenneth Skovhede
2025-05-16 19:01:47 +02:00
committed by GitHub
parent 3de03e51de 97ef8137ed
commit 292107b9de
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/CommandLine/DatabaseTool/Scripts/Server/8. Check for encrypted fields.sql
+1 -1
View File
@@ -1,5 +1,5 @@
/* This script returns an error message if any encrypted values are found */
SELECT "Database is encrypted and must be decrypted before it can be downgraded" AS "Message"
SELECT 'Database is encrypted and must be decrypted before it can be downgraded' AS "Message"
FROM Option WHERE Value LIKE 'enc-v1:%'
UNION ALL
SELECT TargetURL
Duplicati/Library/Backend/AzureBlob/AzureBlobBackend.cs
+1 -1
View File
@@ -119,7 +119,7 @@ namespace Duplicati.Library.Backend.AzureBlob
if (string.IsNullOrWhiteSpace(storageClass))
return DEFAULT_ARCHIVE_CLASSES;
return new HashSet<AccessTier>(storageClass.Split([','], StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).Select(x => new AccessTier(x)));
return new HashSet<AccessTier>(storageClass.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).Select(x => new AccessTier(x)));
}
public string DisplayName => Strings.AzureBlobBackend.DisplayName;
Duplicati/Library/Backend/S3/S3AwsClient.cs
+1 -1
View File
@@ -127,7 +127,7 @@ namespace Duplicati.Library.Backend
if (string.IsNullOrWhiteSpace(storageClass))
return DEFAULT_ARCHIVE_CLASSES;
return new HashSet<S3StorageClass>(storageClass.Split([','], StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).Select(x => new S3StorageClass(x)));
return new HashSet<S3StorageClass>(storageClass.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).Select(x => new S3StorageClass(x)));
}
/// <inheritdoc/>
Duplicati/UnitTest/DatabaseToolTests.cs
+14 -14
View File
@@ -39,14 +39,14 @@ namespace Duplicati.UnitTest
cmd.CommandText = LocalSchemaV12;
cmd.ExecuteNonQuery();
await Program.Main(["upgrade", dbfile, "--no-backups"]);
await Program.Main(["downgrade", dbfile, "--server-version=6", "--local-version=12", "--no-backups"]);
await Program.Main(["upgrade", dbfile, "--no-backups"]);
Assert.AreEqual(0, await Program.Main(["upgrade", dbfile, "--no-backups"]));
Assert.AreEqual(0, await Program.Main(["downgrade", dbfile, "--server-version=6", "--local-version=12", "--no-backups"]));
Assert.AreEqual(0, await Program.Main(["upgrade", dbfile, "--no-backups"]));
await Program.Main(["list", dbfile]);
await Program.Main(["list", dbfile, "RemoteVolume"]);
await Program.Main(["list", dbfile, "RemoteVolume", "--output-json"]);
await Program.Main(["execute", dbfile, "SELECT * FROM RemoteVolume", "--output-json"]);
Assert.AreEqual(0, await Program.Main(["list", dbfile]));
Assert.AreEqual(0, await Program.Main(["list", dbfile, "RemoteVolume"]));
Assert.AreEqual(0, await Program.Main(["list", dbfile, "RemoteVolume", "--output-json"]));
Assert.AreEqual(0, await Program.Main(["execute", dbfile, "SELECT * FROM RemoteVolume", "--output-json"]));
}
[Test]
@@ -59,14 +59,14 @@ namespace Duplicati.UnitTest
cmd.CommandText = ServerSchemaV6;
cmd.ExecuteNonQuery();
await Program.Main(["upgrade", dbfile, "--no-backups"]);
await Program.Main(["downgrade", dbfile, "--server-version=6", "--local-version=12", "--no-backups"]);
await Program.Main(["upgrade", dbfile, "--no-backups"]);
Assert.AreEqual(0, await Program.Main(["upgrade", dbfile, "--no-backups"]));
Assert.AreEqual(0, await Program.Main(["downgrade", dbfile, "--server-version=6", "--local-version=12", "--no-backups"]));
Assert.AreEqual(0, await Program.Main(["upgrade", dbfile, "--no-backups"]));
await Program.Main(["list", dbfile]);
await Program.Main(["list", dbfile, "Source"]);
await Program.Main(["list", dbfile, "Source", "--output-json"]);
await Program.Main(["execute", dbfile, "SELECT * FROM Source", "--output-json"]);
Assert.AreEqual(0, await Program.Main(["list", dbfile]));
Assert.AreEqual(0, await Program.Main(["list", dbfile, "Source"]));
Assert.AreEqual(0, await Program.Main(["list", dbfile, "Source", "--output-json"]));
Assert.AreEqual(0, await Program.Main(["execute", dbfile, "SELECT * FROM Source", "--output-json"]));
}
/// <summary>