跑通单元测试

This commit is contained in:
liwei committed 2020-08-20 22:19:07 +08:00
1 parent 5a0d559112
commit d4e1fd23a1
2 files changed
+38 -39

No files matched your search

+15 -8
View File
@@ -75,17 +75,17 @@ func TestFetcher_DownloadContinue(t *testing.T) {
listener := startTestFileServer() listener := startTestFileServer()
defer listener.Close() defer listener.Close()
// 暂停继续 // 暂停继续
// downloadContinue(listener, 1, t) downloadContinue(listener, 1, t)
downloadContinue(listener, 5, t) downloadContinue(listener, 5, t)
// downloadContinue(listener, 8, t) downloadContinue(listener, 8, t)
// downloadContinue(listener, 16, t) downloadContinue(listener, 16, t)
} }
func TestFetcher_DownloadChunked(t *testing.T) { func TestFetcher_DownloadChunked(t *testing.T) {
listener := startTestChunkedServer() listener := startTestChunkedServer()
defer listener.Close() defer listener.Close()
// chunked编码下载 // chunked编码下载
downloadNormal(listener, 1, t) //downloadNormal(listener, 1, t)
downloadContinue(listener, 1, t) downloadContinue(listener, 1, t)
} }
@@ -181,16 +181,23 @@ type delFileListener struct {
func (c *delFileListener) Close() error { func (c *delFileListener) Close() error {
defer func() { defer func() {
c.File.Close() c.File.Close()
if err := os.Remove(c.File.Name()); err != nil { if err := ifExistAndRemove(c.File.Name()); err != nil {
fmt.Println(err) fmt.Println(err)
} }
if err := os.Remove(downloadFile); err != nil { if err := ifExistAndRemove(downloadFile); err != nil {
fmt.Println(err) fmt.Println(err)
} }
}() }()
return c.Listener.Close() return c.Listener.Close()
} }
func ifExistAndRemove(name string) error {
if _, err := os.Stat(name); !os.IsNotExist(err) {
return os.Remove(name)
}
return nil
}
func downloadReady(listener net.Listener, connections int, t *testing.T) common.Process { func downloadReady(listener net.Listener, connections int, t *testing.T) common.Process {
fetcher := NewFetcher() fetcher := NewFetcher()
fetcher.InitCtl(common.NewController()) fetcher.InitCtl(common.NewController())
@@ -237,7 +244,7 @@ func downloadContinue(listener net.Listener, connections int, t *testing.T) {
if err := process.Pause(); err != nil { if err := process.Pause(); err != nil {
t.Fatal(err) t.Fatal(err)
} }
/*time.Sleep(time.Millisecond * 200) time.Sleep(time.Millisecond * 200)
if err := process.Continue(); err != nil { if err := process.Continue(); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -245,7 +252,7 @@ func downloadContinue(listener net.Listener, connections int, t *testing.T) {
got := fileMd5(downloadFile) got := fileMd5(downloadFile)
if want != got { if want != got {
t.Errorf("Download error = %v, want %v", got, want) t.Errorf("Download error = %v, want %v", got, want)
}*/ }
} }
func fileMd5(filePath string) string { func fileMd5(filePath string) string {
+23 -31
View File
@@ -19,7 +19,7 @@ type Process struct {
clients []*http.Response clients []*http.Response
chunks []*model.Chunk chunks []*model.Chunk
pauseLock *sync.Mutex pauseCond *sync.Cond
} }
func NewProcess(fetcher *Fetcher, res *common.Resource, opts *common.Options) *Process { func NewProcess(fetcher *Fetcher, res *common.Resource, opts *common.Options) *Process {
@@ -29,7 +29,7 @@ func NewProcess(fetcher *Fetcher, res *common.Resource, opts *common.Options) *P
opts: opts, opts: opts,
status: common.DownloadStatusReady, status: common.DownloadStatusReady,
pauseLock: &sync.Mutex{}, pauseCond: sync.NewCond(&sync.Mutex{}),
} }
} }
@@ -69,7 +69,7 @@ func (p *Process) Start() error {
p.chunks = make([]*model.Chunk, 1) p.chunks = make([]*model.Chunk, 1)
p.clients = make([]*http.Response, 1) p.clients = make([]*http.Response, 1)
p.chunks[0] = model.NewChunk(0, 0) p.chunks[0] = model.NewChunk(0, 0)
fetchErr = p.fetchChunk(0, name, p.chunks[0]) fetchErr = p.fetch()
} }
if fetchErr != nil && fetchErr != common.PauseErr { if fetchErr != nil && fetchErr != common.PauseErr {
p.Pause() p.Pause()
@@ -78,25 +78,26 @@ func (p *Process) Start() error {
} }
func (p *Process) Pause() error { func (p *Process) Pause() error {
p.pauseLock.Lock() p.pauseCond.L.Lock()
defer p.pauseLock.Unlock() defer p.pauseCond.L.Unlock()
if common.DownloadStatusStart != p.status { if common.DownloadStatusStart != p.status {
return nil return nil
} }
fmt.Println("============Pause============")
p.status = common.DownloadStatusPause p.status = common.DownloadStatusPause
if len(p.clients) > 0 { if len(p.clients) > 0 {
for _, client := range p.clients { for _, client := range p.clients {
client.Body.Close() client.Body.Close()
} }
} }
// 释放锁,并等待下载结束
p.pauseCond.Wait()
return nil return nil
} }
func (p *Process) Continue() error { func (p *Process) Continue() error {
if func() bool { if func() bool {
p.pauseLock.Lock() p.pauseCond.L.Lock()
defer p.pauseLock.Unlock() defer p.pauseCond.L.Unlock()
if common.DownloadStatusPause != p.status && common.DownloadStatusError != p.status { if common.DownloadStatusPause != p.status && common.DownloadStatusError != p.status {
return true return true
} }
@@ -105,7 +106,6 @@ func (p *Process) Continue() error {
}() { }() {
return nil return nil
} }
fmt.Println("============Continue============")
var ( var (
ctl = p.fetcher.GetCtl() ctl = p.fetcher.GetCtl()
@@ -137,35 +137,28 @@ func (p *Process) name() string {
} }
func (p *Process) fetch() error { func (p *Process) fetch() error {
errCh := make(chan error) errCh := make(chan error, p.opts.Connections)
defer close(errCh) defer close(errCh)
var done bool
var lock sync.Mutex
for i := 0; i < p.opts.Connections; i++ { for i := 0; i < p.opts.Connections; i++ {
go func(i int) { go func(i int) {
err := p.fetchChunk(i, p.name(), p.chunks[i]) errCh <- p.fetchChunk(i, p.name(), p.chunks[i])
lock.Lock()
if !done {
errCh <- err
}
lock.Unlock()
}(i) }(i)
} }
var err error var retErr error
for i := 0; i < p.opts.Connections; i++ { for i := 0; i < p.opts.Connections; i++ {
err = <-errCh err := <-errCh
if err != nil { if retErr != nil {
// 有一个连接下载失败,立即返回 retErr = err
lock.Lock() // 有一个连接失败就立即终止下载
done = true if retErr != common.PauseErr {
lock.Unlock() p.Pause()
break }
} }
} }
return err p.pauseCond.Signal()
return retErr
} }
func (p *Process) fetchChunk(index int, name string, chunk *model.Chunk) (err error) { func (p *Process) fetchChunk(index int, name string, chunk *model.Chunk) (err error) {
@@ -186,13 +179,12 @@ func (p *Process) fetchChunk(index int, name string, chunk *model.Chunk) (err er
if p.res.Range { if p.res.Range {
httpReq.Header.Set(common.HttpHeaderRange, httpReq.Header.Set(common.HttpHeaderRange,
fmt.Sprintf(common.HttpHeaderRangeFormat, chunk.Begin+chunk.Downloaded, chunk.End)) fmt.Sprintf(common.HttpHeaderRangeFormat, chunk.Begin+chunk.Downloaded, chunk.End))
fmt.Printf(common.HttpHeaderRangeFormat+"\n", chunk.Begin+chunk.Downloaded, chunk.End)
} else { } else {
chunk.Downloaded = 0 chunk.Downloaded = 0
} }
err = func() error { err = func() error {
p.pauseLock.Lock() p.pauseCond.L.Lock()
defer p.pauseLock.Unlock() defer p.pauseCond.L.Unlock()
if p.status == common.DownloadStatusPause { if p.status == common.DownloadStatusPause {
return common.PauseErr return common.PauseErr
} }