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

Merge pull request #4933 from gpatel-fr/retrymactestdownload

Browse Source 
try to work around problems in downloading test file by retrying
This commit is contained in:
gpatel-fr
2023-05-17 20:15:10 +02:00
committed by GitHub
parent 619e95d4a6 7e7aadc10f
commit 0664916e95
3 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/tests.yml
+1
View File
@@ -43,6 +43,7 @@ jobs:
- name: Run Unit Tests (Linux and macOS)
if: matrix.os != 'windows-latest'
run: |
export DEBUG_OUTPUT=1
nuget install NUnit.Runners -Version 3.12.0 -OutputDirectory nunit
mono nunit/NUnit.ConsoleRunner.3.12.0/tools/nunit3-console.exe Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll
Duplicati/UnitTest/CommandLineOperationsTests.cs
+23 -3
View File
@@ -82,23 +82,43 @@ namespace Duplicati.UnitTest
try
{
// check if the file should be downloaded, exception if not
using ((HttpWebResponse)webRequest.GetResponse())
using (var wr = (HttpWebResponse)webRequest.GetResponse())
using (WebClient client = new WebClient())
{
client.DownloadFile(url, destinationFilePath);
{ // try to workaround a weird intermittent bug where downloaded size
// differs from real size but no error is thrown
Console.WriteLine("downloading test file to: {0}, length: {1}", destinationFilePath, wr.ContentLength);
var maxAttempts = 5;
while (maxAttempts-- > 0) {
DateTime beginTime = DateTime.Now;
client.DownloadFile(url, destinationFilePath);
long length = new System.IO.FileInfo(destinationFilePath).Length;
Console.WriteLine("downloaded test file: {0}: length {1}, duration {2}", destinationFilePath, length, (DateTime.Now - beginTime).TotalSeconds);
if (length == wr.ContentLength) {
maxAttempts = -1;
} else {
Console.WriteLine("invalid downloaded length {0}, should be {1}...", length, wr.ContentLength);
System.Threading.Thread.Sleep(120000);
}
}
if (maxAttempts == 0) {
throw new Exception(string.Format("Unable to download test file from {0}", url));
}
}
}
catch (WebException ex)
{
if (ex.Response == null){
Console.WriteLine("ex.Response is null !");
throw;
}
if (((HttpWebResponse) ex.Response).StatusCode != HttpStatusCode.NotModified)
{
Console.WriteLine("file to download {0} already exists and is up to date", destinationFilePath);
throw;
}
Console.WriteLine("download exception: {0}", ex.Response);
}
}
Duplicati/UnitTest/GeneralBlackBoxTesting.cs
+34 -2
View File
@@ -65,10 +65,42 @@ namespace Duplicati.UnitTest
public override void OneTimeSetUp()
{
base.OneTimeSetUp();
var url = $"https://testfiles.duplicati.com/{this.zipFilename}";
var destinationFilePath = this.zipFilepath;
var webRequest = (HttpWebRequest)WebRequest.Create(url);
using (var wr = (HttpWebResponse)webRequest.GetResponse())
using (WebClient client = new WebClient())
{
client.DownloadFile($"https://testfiles.duplicati.com/{this.zipFilename}", this.zipFilepath);
Console.WriteLine("downloading test file to: {0}, length: {1}", destinationFilePath, wr.ContentLength);
var maxAttempts = 5;
while (maxAttempts-- > 0) {
try {
DateTime beginTime = DateTime.Now;
client.DownloadFile(url, destinationFilePath);
long length = new System.IO.FileInfo(destinationFilePath).Length;
Console.WriteLine("downloaded test file: {0}: length {1}, duration {2}", destinationFilePath, length, (DateTime.Now - beginTime).TotalSeconds);
if (length == wr.ContentLength) {
maxAttempts = -1;
} else {
Console.WriteLine("invalid downloaded length {0}, should be {1}...", length, wr.ContentLength);
System.Threading.Thread.Sleep(120000);
}
}
catch (WebException ex)
{
if (ex.Response == null){
Console.WriteLine("ex.Response is null !");
} else {
Console.WriteLine("exception {0}", ex);
throw;
}
}
}
if (maxAttempts == 0) {
throw new Exception(string.Format("Unable to download test file from {0}", url));
}
}
System.IO.Compression.ZipFile.ExtractToDirectory(this.zipFilepath, BASEFOLDER);