extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-08 01:25:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

accounting: fix race condition in tests

Browse Source
This commit is contained in:
Nick Craig-Wood 2020-04-24 12:31:33 +01:00
parent 75fc3fe389
commit 8bf6ab2c52
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/accounting/accounting_test.go
View File

@ -92,8 +92,10 @@ func TestAccountRead(t *testing.T) {
acc := newAccountSizeName(stats, in, 1, "test") acc := newAccountSizeName(stats, in, 1, "test")
assert.True(t, acc.start.IsZero()) assert.True(t, acc.start.IsZero())
acc.statmu.Lock()
assert.Equal(t, 0, acc.lpBytes) assert.Equal(t, 0, acc.lpBytes)
assert.Equal(t, int64(0), acc.bytes) assert.Equal(t, int64(0), acc.bytes)
acc.statmu.Unlock()
assert.Equal(t, int64(0), stats.bytes) assert.Equal(t, int64(0), stats.bytes)
var buf = make([]byte, 2) var buf = make([]byte, 2)
@ -103,8 +105,10 @@ func TestAccountRead(t *testing.T) {
assert.Equal(t, []byte{1, 2}, buf[:n]) assert.Equal(t, []byte{1, 2}, buf[:n])
assert.False(t, acc.start.IsZero()) assert.False(t, acc.start.IsZero())
acc.statmu.Lock()
assert.Equal(t, 2, acc.lpBytes) assert.Equal(t, 2, acc.lpBytes)
assert.Equal(t, int64(2), acc.bytes) assert.Equal(t, int64(2), acc.bytes)
acc.statmu.Unlock()
assert.Equal(t, int64(2), stats.bytes) assert.Equal(t, int64(2), stats.bytes)
n, err = acc.Read(buf) n, err = acc.Read(buf)
@ -132,8 +136,10 @@ func testAccountWriteTo(t *testing.T, withBuffer bool) {
} }
assert.True(t, acc.start.IsZero()) assert.True(t, acc.start.IsZero())
acc.statmu.Lock()
assert.Equal(t, 0, acc.lpBytes) assert.Equal(t, 0, acc.lpBytes)
assert.Equal(t, int64(0), acc.bytes) assert.Equal(t, int64(0), acc.bytes)
acc.statmu.Unlock()
assert.Equal(t, int64(0), stats.bytes) assert.Equal(t, int64(0), stats.bytes)
var out bytes.Buffer var out bytes.Buffer
@ -144,8 +150,10 @@ func testAccountWriteTo(t *testing.T, withBuffer bool) {
assert.Equal(t, buf, out.Bytes()) assert.Equal(t, buf, out.Bytes())
assert.False(t, acc.start.IsZero()) assert.False(t, acc.start.IsZero())
acc.statmu.Lock()
assert.Equal(t, len(buf), acc.lpBytes) assert.Equal(t, len(buf), acc.lpBytes)
assert.Equal(t, int64(len(buf)), acc.bytes) assert.Equal(t, int64(len(buf)), acc.bytes)
acc.statmu.Unlock()
assert.Equal(t, int64(len(buf)), stats.bytes) assert.Equal(t, int64(len(buf)), stats.bytes)
assert.NoError(t, acc.Close()) assert.NoError(t, acc.Close())