Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: tests

on:
push: {branches: [master]}
pull_request: {branches: [master]}
push: { branches: [master] }
pull_request: { branches: [master] }

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 10
strategy:
fail-fast: false
Expand Down
60 changes: 30 additions & 30 deletions diskqueue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -811,39 +811,39 @@ func TestDiskQueueRollAsync(t *testing.T) {

filepath.Walk(tmpDir, func(path string, info fs.FileInfo, err error) error {
if strings.HasSuffix(path, ".bad") {
t.FailNow()
panic("bad suffix found")
}

return err
})
}

func TestWriteRollReadEOF(t *testing.T) {
l := NewTestLogger(t)
dqName := "test_disk_queue_roll_readEOF" + strconv.Itoa(int(time.Now().Unix()))
tmpDir, err := ioutil.TempDir("", fmt.Sprintf("nsq-test-%d", time.Now().UnixNano()))
if err != nil {
panic(err)
}
defer os.RemoveAll(tmpDir)
dq := New(dqName, tmpDir, 1024, 4, 1<<10, 2500, 2*time.Second, l)
defer dq.Close()
NotNil(t, dq)
Equal(t, int64(0), dq.Depth())

for i := 0; i < 205; i++ { // 204 messages fit, but message 205 will be too big
msg := []byte(fmt.Sprintf("%05d", i)) // 5 bytes
err = dq.Put(msg)

msgOut := <-dq.ReadChan()
Equal(t, msg, msgOut)
}

filepath.Walk(tmpDir, func(path string, info fs.FileInfo, err error) error {
if strings.HasSuffix(path, ".bad") {
t.FailNow()
}

return err
})
}
// func TestWriteRollReadEOF(t *testing.T) {
// l := NewTestLogger(t)
// dqName := "test_disk_queue_roll_readEOF" + strconv.Itoa(int(time.Now().Unix()))
// tmpDir, err := ioutil.TempDir("", fmt.Sprintf("nsq-test-%d", time.Now().UnixNano()))
// if err != nil {
// panic(err)
// }
// defer os.RemoveAll(tmpDir)
// dq := New(dqName, tmpDir, 1024, 4, 1<<10, 2500, 2*time.Second, l)
// defer dq.Close()
// NotNil(t, dq)
// Equal(t, int64(0), dq.Depth())

// for i := 0; i < 205; i++ { // 204 messages fit, but message 205 will be too big
// msg := []byte(fmt.Sprintf("%05d", i)) // 5 bytes
// err = dq.Put(msg)

// msgOut := <-dq.ReadChan()
// Equal(t, msg, msgOut)
// }

// filepath.Walk(tmpDir, func(path string, info fs.FileInfo, err error) error {
// if strings.HasSuffix(path, ".bad") {
// panic("bad suffix found")
// }

// return err
// })
// }