+2

downloader.go

reviewed

··· 289 289 return 290 290 } 291 291 if !pending { 292 292 + s.DownloadedFileBytes = atomic.AddInt64(&downloadedBytes, c.size()) 293 293 + ch <- s 292 294 continue 293 295 } 294 296 urlDownload.Add(1)

+33

downloader_test.go

reviewed

··· 235 235 } 236 236 } 237 237 238 238 + func TestDownload_ReportPreviouslyDownloadedBytes(t *testing.T) { 239 239 + tmp := t.TempDir() 240 240 + firstChunk := func(url string) DownloadStatus { 241 241 + d := Downloader{ 242 242 + OutputDir: tmp, 243 243 + MaxRetries: 1, 244 244 + ConcurrencyPerServer: 1, 245 245 + ChunkSize: 3, 246 246 + } 247 247 + ch := d.Download(url) 248 248 + <-ch // discard the first status (just the file size) 249 249 + return <-ch 250 250 + } 251 251 + 252 252 + // first download attempt (with server up) 253 253 + url, first := func() (string, DownloadStatus) { 254 254 + s := httptest.NewServer(http.HandlerFunc( 255 255 + func(w http.ResponseWriter, r *http.Request) { 256 256 + fmt.Fprint(w, "42") 257 257 + }, 258 258 + )) 259 259 + defer s.Close() 260 260 + got := firstChunk(s.URL) 261 261 + return s.URL, got 262 262 + }() 263 263 + 264 264 + // second download attempt (with server down) 265 265 + second := firstChunk(url) 266 266 + if first.DownloadedFileBytes != second.DownloadedFileBytes { 267 267 + t.Errorf("expected the same number of downloaded bytes, got %d and %d", first.DownloadedFileBytes, second.DownloadedFileBytes) 268 268 + } 269 269 + } 270 270 + 238 271 func TestDownloadWithContext_ErrorUserTimeout(t *testing.T) { 239 272 userTimeout := 250 * time.Millisecond // please note that the user timeout is less than the timeout per chunk. 240 273 timeout := 10 * userTimeout