summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2021-10-13 09:00:03 +0300
committerPaul Buetow <paul@buetow.org>2021-10-13 09:00:03 +0300
commit7b873100d94ddc3c698a620cb83b61dcb2074303 (patch)
tree7ecbbce3c7d7c52671b8cb26eb15260b529e9236
parenta6098084f7150df34edecf1519386bd28a527361 (diff)
add another dcat integration test - catting 100 files at once
Diffstat
-rw-r--r--TODO.md1
-rw-r--r--integrationtests/commandutils.go30
-rw-r--r--integrationtests/dcat.txt (renamed from integrationtests/dcat.txt.expected)0
-rw-r--r--integrationtests/dcat2.txt500
-rw-r--r--integrationtests/dcat_test.go30
-rw-r--r--integrationtests/dgrep_test.go4
-rw-r--r--integrationtests/dmap_test.go6
-rw-r--r--integrationtests/dtail_test.go6
-rw-r--r--integrationtests/dtailhealthcheck_test.go8
-rw-r--r--internal/server/handlers/basehandler.go2
10 files changed, 558 insertions, 29 deletions
diff --git a/TODO.md b/TODO.md
index 6c35a86..7116507 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,7 +3,6 @@ TODO
This is a loose list of what to do. Maybe for the next releae or maybe for a later one.
-[ ] Adjust JSONSchema to reflect all the changes made. (check all config options here)
[ ] Client 4.x should print a warning when trying to connect to a 3.x server.
[ ] Client 3.x should print a warning when trying to connect to a 4.x server.
[ ] Update docs for color configuration
diff --git a/integrationtests/commandutils.go b/integrationtests/commandutils.go
index d2f567f..82c0017 100644
--- a/integrationtests/commandutils.go
+++ b/integrationtests/commandutils.go
@@ -6,18 +6,20 @@ import (
"fmt"
"os"
"os/exec"
+ "strings"
"sync"
"syscall"
+ "testing"
"time"
)
// The exit code and the Go error of the command terminated.
type exitPromise func() (int, error)
-func runCommand(ctx context.Context, stdoutFile, cmdStr string,
+func runCommand(ctx context.Context, t *testing.T, stdoutFile, cmdStr string,
args ...string) (int, error) {
- stdinCh, _, exit, err := startCommand(ctx, cmdStr, args...)
+ stdinCh, _, exit, err := startCommand(ctx, t, cmdStr, args...)
if err != nil {
return -1, err
}
@@ -43,19 +45,19 @@ func runCommand(ctx context.Context, stdoutFile, cmdStr string,
return exit()
}
-func runCommandRetry(ctx context.Context, retries int, stdoutFile, cmd string,
- args ...string) (exitCode int, err error) {
+func runCommandRetry(ctx context.Context, t *testing.T, retries int, stdoutFile,
+ cmd string, args ...string) (exitCode int, err error) {
for i := 0; i < retries; i++ {
time.Sleep(time.Second)
- if exitCode, err = runCommand(ctx, stdoutFile, cmd, args...); exitCode == 0 {
+ if exitCode, err = runCommand(ctx, t, stdoutFile, cmd, args...); exitCode == 0 {
return
}
}
return
}
-func startCommand(ctx context.Context, cmdStr string,
+func startCommand(ctx context.Context, t *testing.T, cmdStr string,
args ...string) (<-chan string, <-chan string, exitPromise, error) {
stdoutCh := make(chan string)
@@ -66,6 +68,7 @@ func startCommand(ctx context.Context, cmdStr string,
fmt.Errorf("no such executable '%s', please compile first: %v", cmdStr, err)
}
+ t.Log(cmdStr, strings.Join(args, " "))
cmd := exec.CommandContext(ctx, cmdStr, args...)
cmdStdout, err := cmd.StdoutPipe()
@@ -87,7 +90,7 @@ func startCommand(ctx context.Context, cmdStr string,
}
}()
go func() {
- close(stderrCh)
+ defer close(stderrCh)
scanner := bufio.NewScanner(cmdStderr)
scanner.Split(bufio.ScanLines)
for scanner.Scan() {
@@ -102,11 +105,12 @@ func startCommand(ctx context.Context, cmdStr string,
}
func exitCodeFromError(err error) int {
- if err != nil {
- if exitError, ok := err.(*exec.ExitError); ok {
- ws := exitError.Sys().(syscall.WaitStatus)
- return ws.ExitStatus()
- }
+ if err == nil {
+ return 0
+ }
+ if exitError, ok := err.(*exec.ExitError); ok {
+ ws := exitError.Sys().(syscall.WaitStatus)
+ return ws.ExitStatus()
}
- return 0
+ panic(fmt.Sprintf("Unable to get process exit code from error: %v", err))
}
diff --git a/integrationtests/dcat.txt.expected b/integrationtests/dcat.txt
index 9e80424..9e80424 100644
--- a/integrationtests/dcat.txt.expected
+++ b/integrationtests/dcat.txt
diff --git a/integrationtests/dcat2.txt b/integrationtests/dcat2.txt
new file mode 100644
index 0000000..9e80424
--- /dev/null
+++ b/integrationtests/dcat2.txt
@@ -0,0 +1,500 @@
+1 Sat 2 Oct 13:46:45 EEST 2021
+2 Sat 2 Oct 13:46:45 EEST 2021
+3 Sat 2 Oct 13:46:45 EEST 2021
+4 Sat 2 Oct 13:46:45 EEST 2021
+5 Sat 2 Oct 13:46:45 EEST 2021
+6 Sat 2 Oct 13:46:45 EEST 2021
+7 Sat 2 Oct 13:46:45 EEST 2021
+8 Sat 2 Oct 13:46:45 EEST 2021
+9 Sat 2 Oct 13:46:45 EEST 2021
+10 Sat 2 Oct 13:46:45 EEST 2021
+11 Sat 2 Oct 13:46:45 EEST 2021
+12 Sat 2 Oct 13:46:45 EEST 2021
+13 Sat 2 Oct 13:46:45 EEST 2021
+14 Sat 2 Oct 13:46:45 EEST 2021
+15 Sat 2 Oct 13:46:45 EEST 2021
+16 Sat 2 Oct 13:46:45 EEST 2021
+17 Sat 2 Oct 13:46:45 EEST 2021
+18 Sat 2 Oct 13:46:45 EEST 2021
+19 Sat 2 Oct 13:46:45 EEST 2021
+20 Sat 2 Oct 13:46:45 EEST 2021
+21 Sat 2 Oct 13:46:45 EEST 2021
+22 Sat 2 Oct 13:46:45 EEST 2021
+23 Sat 2 Oct 13:46:45 EEST 2021
+24 Sat 2 Oct 13:46:45 EEST 2021
+25 Sat 2 Oct 13:46:45 EEST 2021
+26 Sat 2 Oct 13:46:45 EEST 2021
+27 Sat 2 Oct 13:46:45 EEST 2021
+28 Sat 2 Oct 13:46:45 EEST 2021
+29 Sat 2 Oct 13:46:45 EEST 2021
+30 Sat 2 Oct 13:46:45 EEST 2021
+31 Sat 2 Oct 13:46:45 EEST 2021
+32 Sat 2 Oct 13:46:45 EEST 2021
+33 Sat 2 Oct 13:46:45 EEST 2021
+34 Sat 2 Oct 13:46:45 EEST 2021
+35 Sat 2 Oct 13:46:45 EEST 2021
+36 Sat 2 Oct 13:46:45 EEST 2021
+37 Sat 2 Oct 13:46:45 EEST 2021
+38 Sat 2 Oct 13:46:45 EEST 2021
+39 Sat 2 Oct 13:46:45 EEST 2021
+40 Sat 2 Oct 13:46:45 EEST 2021
+41 Sat 2 Oct 13:46:45 EEST 2021
+42 Sat 2 Oct 13:46:45 EEST 2021
+43 Sat 2 Oct 13:46:45 EEST 2021
+44 Sat 2 Oct 13:46:45 EEST 2021
+45 Sat 2 Oct 13:46:45 EEST 2021
+46 Sat 2 Oct 13:46:45 EEST 2021
+47 Sat 2 Oct 13:46:45 EEST 2021
+48 Sat 2 Oct 13:46:45 EEST 2021
+49 Sat 2 Oct 13:46:45 EEST 2021
+50 Sat 2 Oct 13:46:45 EEST 2021
+51 Sat 2 Oct 13:46:45 EEST 2021
+52 Sat 2 Oct 13:46:45 EEST 2021
+53 Sat 2 Oct 13:46:45 EEST 2021
+54 Sat 2 Oct 13:46:45 EEST 2021
+55 Sat 2 Oct 13:46:45 EEST 2021
+56 Sat 2 Oct 13:46:45 EEST 2021
+57 Sat 2 Oct 13:46:45 EEST 2021
+58 Sat 2 Oct 13:46:45 EEST 2021
+59 Sat 2 Oct 13:46:45 EEST 2021
+60 Sat 2 Oct 13:46:45 EEST 2021
+61 Sat 2 Oct 13:46:45 EEST 2021
+62 Sat 2 Oct 13:46:45 EEST 2021
+63 Sat 2 Oct 13:46:45 EEST 2021
+64 Sat 2 Oct 13:46:45 EEST 2021
+65 Sat 2 Oct 13:46:45 EEST 2021
+66 Sat 2 Oct 13:46:45 EEST 2021
+67 Sat 2 Oct 13:46:45 EEST 2021
+68 Sat 2 Oct 13:46:45 EEST 2021
+69 Sat 2 Oct 13:46:45 EEST 2021
+70 Sat 2 Oct 13:46:45 EEST 2021
+71 Sat 2 Oct 13:46:45 EEST 2021
+72 Sat 2 Oct 13:46:45 EEST 2021
+73 Sat 2 Oct 13:46:45 EEST 2021
+74 Sat 2 Oct 13:46:45 EEST 2021
+75 Sat 2 Oct 13:46:45 EEST 2021
+76 Sat 2 Oct 13:46:45 EEST 2021
+77 Sat 2 Oct 13:46:45 EEST 2021
+78 Sat 2 Oct 13:46:45 EEST 2021
+79 Sat 2 Oct 13:46:45 EEST 2021
+80 Sat 2 Oct 13:46:45 EEST 2021
+81 Sat 2 Oct 13:46:45 EEST 2021
+82 Sat 2 Oct 13:46:45 EEST 2021
+83 Sat 2 Oct 13:46:45 EEST 2021
+84 Sat 2 Oct 13:46:45 EEST 2021
+85 Sat 2 Oct 13:46:45 EEST 2021
+86 Sat 2 Oct 13:46:45 EEST 2021
+87 Sat 2 Oct 13:46:45 EEST 2021
+88 Sat 2 Oct 13:46:45 EEST 2021
+89 Sat 2 Oct 13:46:45 EEST 2021
+90 Sat 2 Oct 13:46:45 EEST 2021
+91 Sat 2 Oct 13:46:45 EEST 2021
+92 Sat 2 Oct 13:46:45 EEST 2021
+93 Sat 2 Oct 13:46:45 EEST 2021
+94 Sat 2 Oct 13:46:45 EEST 2021
+95 Sat 2 Oct 13:46:45 EEST 2021
+96 Sat 2 Oct 13:46:45 EEST 2021
+97 Sat 2 Oct 13:46:45 EEST 2021
+98 Sat 2 Oct 13:46:45 EEST 2021
+99 Sat 2 Oct 13:46:45 EEST 2021
+100 Sat 2 Oct 13:46:45 EEST 2021
+101 Sat 2 Oct 13:46:45 EEST 2021
+102 Sat 2 Oct 13:46:45 EEST 2021
+103 Sat 2 Oct 13:46:45 EEST 2021
+104 Sat 2 Oct 13:46:45 EEST 2021
+105 Sat 2 Oct 13:46:45 EEST 2021
+106 Sat 2 Oct 13:46:45 EEST 2021
+107 Sat 2 Oct 13:46:45 EEST 2021
+108 Sat 2 Oct 13:46:45 EEST 2021
+109 Sat 2 Oct 13:46:45 EEST 2021
+110 Sat 2 Oct 13:46:45 EEST 2021
+111 Sat 2 Oct 13:46:45 EEST 2021
+112 Sat 2 Oct 13:46:45 EEST 2021
+113 Sat 2 Oct 13:46:45 EEST 2021
+114 Sat 2 Oct 13:46:45 EEST 2021
+115 Sat 2 Oct 13:46:45 EEST 2021
+116 Sat 2 Oct 13:46:45 EEST 2021
+117 Sat 2 Oct 13:46:45 EEST 2021
+118 Sat 2 Oct 13:46:45 EEST 2021
+119 Sat 2 Oct 13:46:45 EEST 2021
+120 Sat 2 Oct 13:46:45 EEST 2021
+121 Sat 2 Oct 13:46:45 EEST 2021
+122 Sat 2 Oct 13:46:45 EEST 2021
+123 Sat 2 Oct 13:46:45 EEST 2021
+124 Sat 2 Oct 13:46:45 EEST 2021
+125 Sat 2 Oct 13:46:45 EEST 2021
+126 Sat 2 Oct 13:46:45 EEST 2021
+127 Sat 2 Oct 13:46:45 EEST 2021
+128 Sat 2 Oct 13:46:45 EEST 2021
+129 Sat 2 Oct 13:46:45 EEST 2021
+130 Sat 2 Oct 13:46:45 EEST 2021
+131 Sat 2 Oct 13:46:45 EEST 2021
+132 Sat 2 Oct 13:46:45 EEST 2021
+133 Sat 2 Oct 13:46:45 EEST 2021
+134 Sat 2 Oct 13:46:45 EEST 2021
+135 Sat 2 Oct 13:46:45 EEST 2021
+136 Sat 2 Oct 13:46:45 EEST 2021
+137 Sat 2 Oct 13:46:45 EEST 2021
+138 Sat 2 Oct 13:46:45 EEST 2021
+139 Sat 2 Oct 13:46:45 EEST 2021
+140 Sat 2 Oct 13:46:45 EEST 2021
+141 Sat 2 Oct 13:46:45 EEST 2021
+142 Sat 2 Oct 13:46:45 EEST 2021
+143 Sat 2 Oct 13:46:45 EEST 2021
+144 Sat 2 Oct 13:46:45 EEST 2021
+145 Sat 2 Oct 13:46:45 EEST 2021
+146 Sat 2 Oct 13:46:45 EEST 2021
+147 Sat 2 Oct 13:46:45 EEST 2021
+148 Sat 2 Oct 13:46:45 EEST 2021
+149 Sat 2 Oct 13:46:45 EEST 2021
+150 Sat 2 Oct 13:46:45 EEST 2021
+151 Sat 2 Oct 13:46:45 EEST 2021
+152 Sat 2 Oct 13:46:45 EEST 2021
+153 Sat 2 Oct 13:46:45 EEST 2021
+154 Sat 2 Oct 13:46:45 EEST 2021
+155 Sat 2 Oct 13:46:45 EEST 2021
+156 Sat 2 Oct 13:46:45 EEST 2021
+157 Sat 2 Oct 13:46:45 EEST 2021
+158 Sat 2 Oct 13:46:45 EEST 2021
+159 Sat 2 Oct 13:46:45 EEST 2021
+160 Sat 2 Oct 13:46:45 EEST 2021
+161 Sat 2 Oct 13:46:45 EEST 2021
+162 Sat 2 Oct 13:46:45 EEST 2021
+163 Sat 2 Oct 13:46:45 EEST 2021
+164 Sat 2 Oct 13:46:45 EEST 2021
+165 Sat 2 Oct 13:46:45 EEST 2021
+166 Sat 2 Oct 13:46:45 EEST 2021
+167 Sat 2 Oct 13:46:45 EEST 2021
+168 Sat 2 Oct 13:46:45 EEST 2021
+169 Sat 2 Oct 13:46:45 EEST 2021
+170 Sat 2 Oct 13:46:45 EEST 2021
+171 Sat 2 Oct 13:46:45 EEST 2021
+172 Sat 2 Oct 13:46:45 EEST 2021
+173 Sat 2 Oct 13:46:45 EEST 2021
+174 Sat 2 Oct 13:46:45 EEST 2021
+175 Sat 2 Oct 13:46:45 EEST 2021
+176 Sat 2 Oct 13:46:45 EEST 2021
+177 Sat 2 Oct 13:46:45 EEST 2021
+178 Sat 2 Oct 13:46:45 EEST 2021
+179 Sat 2 Oct 13:46:45 EEST 2021
+180 Sat 2 Oct 13:46:45 EEST 2021
+181 Sat 2 Oct 13:46:45 EEST 2021
+182 Sat 2 Oct 13:46:45 EEST 2021
+183 Sat 2 Oct 13:46:45 EEST 2021
+184 Sat 2 Oct 13:46:45 EEST 2021
+185 Sat 2 Oct 13:46:45 EEST 2021
+186 Sat 2 Oct 13:46:45 EEST 2021
+187 Sat 2 Oct 13:46:45 EEST 2021
+188 Sat 2 Oct 13:46:45 EEST 2021
+189 Sat 2 Oct 13:46:45 EEST 2021
+190 Sat 2 Oct 13:46:45 EEST 2021
+191 Sat 2 Oct 13:46:45 EEST 2021
+192 Sat 2 Oct 13:46:45 EEST 2021
+193 Sat 2 Oct 13:46:45 EEST 2021
+194 Sat 2 Oct 13:46:45 EEST 2021
+195 Sat 2 Oct 13:46:45 EEST 2021
+196 Sat 2 Oct 13:46:45 EEST 2021
+197 Sat 2 Oct 13:46:45 EEST 2021
+198 Sat 2 Oct 13:46:45 EEST 2021
+199 Sat 2 Oct 13:46:45 EEST 2021
+200 Sat 2 Oct 13:46:45 EEST 2021
+201 Sat 2 Oct 13:46:45 EEST 2021
+202 Sat 2 Oct 13:46:45 EEST 2021
+203 Sat 2 Oct 13:46:45 EEST 2021
+204 Sat 2 Oct 13:46:45 EEST 2021
+205 Sat 2 Oct 13:46:45 EEST 2021
+206 Sat 2 Oct 13:46:45 EEST 2021
+207 Sat 2 Oct 13:46:45 EEST 2021
+208 Sat 2 Oct 13:46:45 EEST 2021
+209 Sat 2 Oct 13:46:45 EEST 2021
+210 Sat 2 Oct 13:46:45 EEST 2021
+211 Sat 2 Oct 13:46:45 EEST 2021
+212 Sat 2 Oct 13:46:45 EEST 2021
+213 Sat 2 Oct 13:46:45 EEST 2021
+214 Sat 2 Oct 13:46:45 EEST 2021
+215 Sat 2 Oct 13:46:45 EEST 2021
+216 Sat 2 Oct 13:46:45 EEST 2021
+217 Sat 2 Oct 13:46:45 EEST 2021
+218 Sat 2 Oct 13:46:45 EEST 2021
+219 Sat 2 Oct 13:46:45 EEST 2021
+220 Sat 2 Oct 13:46:45 EEST 2021
+221 Sat 2 Oct 13:46:45 EEST 2021
+222 Sat 2 Oct 13:46:45 EEST 2021
+223 Sat 2 Oct 13:46:45 EEST 2021
+224 Sat 2 Oct 13:46:45 EEST 2021
+225 Sat 2 Oct 13:46:45 EEST 2021
+226 Sat 2 Oct 13:46:45 EEST 2021
+227 Sat 2 Oct 13:46:45 EEST 2021
+228 Sat 2 Oct 13:46:45 EEST 2021
+229 Sat 2 Oct 13:46:45 EEST 2021
+230 Sat 2 Oct 13:46:45 EEST 2021
+231 Sat 2 Oct 13:46:45 EEST 2021
+232 Sat 2 Oct 13:46:45 EEST 2021
+233 Sat 2 Oct 13:46:45 EEST 2021
+234 Sat 2 Oct 13:46:45 EEST 2021
+235 Sat 2 Oct 13:46:45 EEST 2021
+236 Sat 2 Oct 13:46:45 EEST 2021
+237 Sat 2 Oct 13:46:45 EEST 2021
+238 Sat 2 Oct 13:46:45 EEST 2021
+239 Sat 2 Oct 13:46:45 EEST 2021
+240 Sat 2 Oct 13:46:45 EEST 2021
+241 Sat 2 Oct 13:46:45 EEST 2021
+242 Sat 2 Oct 13:46:45 EEST 2021
+243 Sat 2 Oct 13:46:45 EEST 2021
+244 Sat 2 Oct 13:46:45 EEST 2021
+245 Sat 2 Oct 13:46:45 EEST 2021
+246 Sat 2 Oct 13:46:45 EEST 2021
+247 Sat 2 Oct 13:46:45 EEST 2021
+248 Sat 2 Oct 13:46:45 EEST 2021
+249 Sat 2 Oct 13:46:45 EEST 2021
+250 Sat 2 Oct 13:46:45 EEST 2021
+251 Sat 2 Oct 13:46:45 EEST 2021
+252 Sat 2 Oct 13:46:45 EEST 2021
+253 Sat 2 Oct 13:46:45 EEST 2021
+254 Sat 2 Oct 13:46:45 EEST 2021
+255 Sat 2 Oct 13:46:45 EEST 2021
+256 Sat 2 Oct 13:46:45 EEST 2021
+257 Sat 2 Oct 13:46:45 EEST 2021
+258 Sat 2 Oct 13:46:45 EEST 2021
+259 Sat 2 Oct 13:46:45 EEST 2021
+260 Sat 2 Oct 13:46:45 EEST 2021
+261 Sat 2 Oct 13:46:45 EEST 2021
+262 Sat 2 Oct 13:46:45 EEST 2021
+263 Sat 2 Oct 13:46:45 EEST 2021
+264 Sat 2 Oct 13:46:45 EEST 2021
+265 Sat 2 Oct 13:46:45 EEST 2021
+266 Sat 2 Oct 13:46:45 EEST 2021
+267 Sat 2 Oct 13:46:45 EEST 2021
+268 Sat 2 Oct 13:46:45 EEST 2021
+269 Sat 2 Oct 13:46:45 EEST 2021
+270 Sat 2 Oct 13:46:45 EEST 2021
+271 Sat 2 Oct 13:46:45 EEST 2021
+272 Sat 2 Oct 13:46:45 EEST 2021
+273 Sat 2 Oct 13:46:45 EEST 2021
+274 Sat 2 Oct 13:46:45 EEST 2021
+275 Sat 2 Oct 13:46:45 EEST 2021
+276 Sat 2 Oct 13:46:45 EEST 2021
+277 Sat 2 Oct 13:46:45 EEST 2021
+278 Sat 2 Oct 13:46:45 EEST 2021
+279 Sat 2 Oct 13:46:45 EEST 2021
+280 Sat 2 Oct 13:46:45 EEST 2021
+281 Sat 2 Oct 13:46:45 EEST 2021
+282 Sat 2 Oct 13:46:45 EEST 2021
+283 Sat 2 Oct 13:46:45 EEST 2021
+284 Sat 2 Oct 13:46:45 EEST 2021
+285 Sat 2 Oct 13:46:45 EEST 2021
+286 Sat 2 Oct 13:46:45 EEST 2021
+287 Sat 2 Oct 13:46:45 EEST 2021
+288 Sat 2 Oct 13:46:45 EEST 2021
+289 Sat 2 Oct 13:46:45 EEST 2021
+290 Sat 2 Oct 13:46:45 EEST 2021
+291 Sat 2 Oct 13:46:45 EEST 2021
+292 Sat 2 Oct 13:46:45 EEST 2021
+293 Sat 2 Oct 13:46:45 EEST 2021
+294 Sat 2 Oct 13:46:45 EEST 2021
+295 Sat 2 Oct 13:46:45 EEST 2021
+296 Sat 2 Oct 13:46:45 EEST 2021
+297 Sat 2 Oct 13:46:45 EEST 2021
+298 Sat 2 Oct 13:46:45 EEST 2021
+299 Sat 2 Oct 13:46:45 EEST 2021
+300 Sat 2 Oct 13:46:45 EEST 2021
+301 Sat 2 Oct 13:46:45 EEST 2021
+302 Sat 2 Oct 13:46:45 EEST 2021
+303 Sat 2 Oct 13:46:45 EEST 2021
+304 Sat 2 Oct 13:46:45 EEST 2021
+305 Sat 2 Oct 13:46:45 EEST 2021
+306 Sat 2 Oct 13:46:45 EEST 2021
+307 Sat 2 Oct 13:46:45 EEST 2021
+308 Sat 2 Oct 13:46:45 EEST 2021
+309 Sat 2 Oct 13:46:45 EEST 2021
+310 Sat 2 Oct 13:46:45 EEST 2021
+311 Sat 2 Oct 13:46:45 EEST 2021
+312 Sat 2 Oct 13:46:45 EEST 2021
+313 Sat 2 Oct 13:46:45 EEST 2021
+314 Sat 2 Oct 13:46:45 EEST 2021
+315 Sat 2 Oct 13:46:45 EEST 2021
+316 Sat 2 Oct 13:46:45 EEST 2021
+317 Sat 2 Oct 13:46:45 EEST 2021
+318 Sat 2 Oct 13:46:45 EEST 2021
+319 Sat 2 Oct 13:46:45 EEST 2021
+320 Sat 2 Oct 13:46:45 EEST 2021
+321 Sat 2 Oct 13:46:45 EEST 2021
+322 Sat 2 Oct 13:46:45 EEST 2021
+323 Sat 2 Oct 13:46:45 EEST 2021
+324 Sat 2 Oct 13:46:45 EEST 2021
+325 Sat 2 Oct 13:46:45 EEST 2021
+326 Sat 2 Oct 13:46:45 EEST 2021
+327 Sat 2 Oct 13:46:45 EEST 2021
+328 Sat 2 Oct 13:46:45 EEST 2021
+329 Sat 2 Oct 13:46:45 EEST 2021
+330 Sat 2 Oct 13:46:46 EEST 2021
+331 Sat 2 Oct 13:46:46 EEST 2021
+332 Sat 2 Oct 13:46:46 EEST 2021
+333 Sat 2 Oct 13:46:46 EEST 2021
+334 Sat 2 Oct 13:46:46 EEST 2021
+335 Sat 2 Oct 13:46:46 EEST 2021
+336 Sat 2 Oct 13:46:46 EEST 2021
+337 Sat 2 Oct 13:46:46 EEST 2021
+338 Sat 2 Oct 13:46:46 EEST 2021
+339 Sat 2 Oct 13:46:46 EEST 2021
+340 Sat 2 Oct 13:46:46 EEST 2021
+341 Sat 2 Oct 13:46:46 EEST 2021
+342 Sat 2 Oct 13:46:46 EEST 2021
+343 Sat 2 Oct 13:46:46 EEST 2021
+344 Sat 2 Oct 13:46:46 EEST 2021
+345 Sat 2 Oct 13:46:46 EEST 2021
+346 Sat 2 Oct 13:46:46 EEST 2021
+347 Sat 2 Oct 13:46:46 EEST 2021
+348 Sat 2 Oct 13:46:46 EEST 2021
+349 Sat 2 Oct 13:46:46 EEST 2021
+350 Sat 2 Oct 13:46:46 EEST 2021
+351 Sat 2 Oct 13:46:46 EEST 2021
+352 Sat 2 Oct 13:46:46 EEST 2021
+353 Sat 2 Oct 13:46:46 EEST 2021
+354 Sat 2 Oct 13:46:46 EEST 2021
+355 Sat 2 Oct 13:46:46 EEST 2021
+356 Sat 2 Oct 13:46:46 EEST 2021
+357 Sat 2 Oct 13:46:46 EEST 2021
+358 Sat 2 Oct 13:46:46 EEST 2021
+359 Sat 2 Oct 13:46:46 EEST 2021
+360 Sat 2 Oct 13:46:46 EEST 2021
+361 Sat 2 Oct 13:46:46 EEST 2021
+362 Sat 2 Oct 13:46:46 EEST 2021
+363 Sat 2 Oct 13:46:46 EEST 2021
+364 Sat 2 Oct 13:46:46 EEST 2021
+365 Sat 2 Oct 13:46:46 EEST 2021
+366 Sat 2 Oct 13:46:46 EEST 2021
+367 Sat 2 Oct 13:46:46 EEST 2021
+368 Sat 2 Oct 13:46:46 EEST 2021
+369 Sat 2 Oct 13:46:46 EEST 2021
+370 Sat 2 Oct 13:46:46 EEST 2021
+371 Sat 2 Oct 13:46:46 EEST 2021
+372 Sat 2 Oct 13:46:46 EEST 2021
+373 Sat 2 Oct 13:46:46 EEST 2021
+374 Sat 2 Oct 13:46:46 EEST 2021
+375 Sat 2 Oct 13:46:46 EEST 2021
+376 Sat 2 Oct 13:46:46 EEST 2021
+377 Sat 2 Oct 13:46:46 EEST 2021
+378 Sat 2 Oct 13:46:46 EEST 2021
+379 Sat 2 Oct 13:46:46 EEST 2021
+380 Sat 2 Oct 13:46:46 EEST 2021
+381 Sat 2 Oct 13:46:46 EEST 2021
+382 Sat 2 Oct 13:46:46 EEST 2021
+383 Sat 2 Oct 13:46:46 EEST 2021
+384 Sat 2 Oct 13:46:46 EEST 2021
+385 Sat 2 Oct 13:46:46 EEST 2021
+386 Sat 2 Oct 13:46:46 EEST 2021
+387 Sat 2 Oct 13:46:46 EEST 2021
+388 Sat 2 Oct 13:46:46 EEST 2021
+389 Sat 2 Oct 13:46:46 EEST 2021
+390 Sat 2 Oct 13:46:46 EEST 2021
+391 Sat 2 Oct 13:46:46 EEST 2021
+392 Sat 2 Oct 13:46:46 EEST 2021
+393 Sat 2 Oct 13:46:46 EEST 2021
+394 Sat 2 Oct 13:46:46 EEST 2021
+395 Sat 2 Oct 13:46:46 EEST 2021
+396 Sat 2 Oct 13:46:46 EEST 2021
+397 Sat 2 Oct 13:46:46 EEST 2021
+398 Sat 2 Oct 13:46:46 EEST 2021
+399 Sat 2 Oct 13:46:46 EEST 2021
+400 Sat 2 Oct 13:46:46 EEST 2021
+401 Sat 2 Oct 13:46:46 EEST 2021
+402 Sat 2 Oct 13:46:46 EEST 2021
+403 Sat 2 Oct 13:46:46 EEST 2021
+404 Sat 2 Oct 13:46:46 EEST 2021
+405 Sat 2 Oct 13:46:46 EEST 2021
+406 Sat 2 Oct 13:46:46 EEST 2021
+407 Sat 2 Oct 13:46:46 EEST 2021
+408 Sat 2 Oct 13:46:46 EEST 2021
+409 Sat 2 Oct 13:46:46 EEST 2021
+410 Sat 2 Oct 13:46:46 EEST 2021
+411 Sat 2 Oct 13:46:46 EEST 2021
+412 Sat 2 Oct 13:46:46 EEST 2021
+413 Sat 2 Oct 13:46:46 EEST 2021
+414 Sat 2 Oct 13:46:46 EEST 2021
+415 Sat 2 Oct 13:46:46 EEST 2021
+416 Sat 2 Oct 13:46:46 EEST 2021
+417 Sat 2 Oct 13:46:46 EEST 2021
+418 Sat 2 Oct 13:46:46 EEST 2021
+419 Sat 2 Oct 13:46:46 EEST 2021
+420 Sat 2 Oct 13:46:46 EEST 2021
+421 Sat 2 Oct 13:46:46 EEST 2021
+422 Sat 2 Oct 13:46:46 EEST 2021
+423 Sat 2 Oct 13:46:46 EEST 2021
+424 Sat 2 Oct 13:46:46 EEST 2021
+425 Sat 2 Oct 13:46:46 EEST 2021
+426 Sat 2 Oct 13:46:46 EEST 2021
+427 Sat 2 Oct 13:46:46 EEST 2021
+428 Sat 2 Oct 13:46:46 EEST 2021
+429 Sat 2 Oct 13:46:46 EEST 2021
+430 Sat 2 Oct 13:46:46 EEST 2021
+431 Sat 2 Oct 13:46:46 EEST 2021
+432 Sat 2 Oct 13:46:46 EEST 2021
+433 Sat 2 Oct 13:46:46 EEST 2021
+434 Sat 2 Oct 13:46:46 EEST 2021
+435 Sat 2 Oct 13:46:46 EEST 2021
+436 Sat 2 Oct 13:46:46 EEST 2021
+437 Sat 2 Oct 13:46:46 EEST 2021
+438 Sat 2 Oct 13:46:46 EEST 2021
+439 Sat 2 Oct 13:46:46 EEST 2021
+440 Sat 2 Oct 13:46:46 EEST 2021
+441 Sat 2 Oct 13:46:46 EEST 2021
+442 Sat 2 Oct 13:46:46 EEST 2021
+443 Sat 2 Oct 13:46:46 EEST 2021
+444 Sat 2 Oct 13:46:46 EEST 2021
+445 Sat 2 Oct 13:46:46 EEST 2021
+446 Sat 2 Oct 13:46:46 EEST 2021
+447 Sat 2 Oct 13:46:46 EEST 2021
+448 Sat 2 Oct 13:46:46 EEST 2021
+449 Sat 2 Oct 13:46:46 EEST 2021
+450 Sat 2 Oct 13:46:46 EEST 2021
+451 Sat 2 Oct 13:46:46 EEST 2021
+452 Sat 2 Oct 13:46:46 EEST 2021
+453 Sat 2 Oct 13:46:46 EEST 2021
+454 Sat 2 Oct 13:46:46 EEST 2021
+455 Sat 2 Oct 13:46:46 EEST 2021
+456 Sat 2 Oct 13:46:46 EEST 2021
+457 Sat 2 Oct 13:46:46 EEST 2021
+458 Sat 2 Oct 13:46:46 EEST 2021
+459 Sat 2 Oct 13:46:46 EEST 2021
+460 Sat 2 Oct 13:46:46 EEST 2021
+461 Sat 2 Oct 13:46:46 EEST 2021
+462 Sat 2 Oct 13:46:46 EEST 2021
+463 Sat 2 Oct 13:46:46 EEST 2021
+464 Sat 2 Oct 13:46:46 EEST 2021
+465 Sat 2 Oct 13:46:46 EEST 2021
+466 Sat 2 Oct 13:46:46 EEST 2021
+467 Sat 2 Oct 13:46:46 EEST 2021
+468 Sat 2 Oct 13:46:46 EEST 2021
+469 Sat 2 Oct 13:46:46 EEST 2021
+470 Sat 2 Oct 13:46:46 EEST 2021
+471 Sat 2 Oct 13:46:46 EEST 2021
+472 Sat 2 Oct 13:46:46 EEST 2021
+473 Sat 2 Oct 13:46:46 EEST 2021
+474 Sat 2 Oct 13:46:46 EEST 2021
+475 Sat 2 Oct 13:46:46 EEST 2021
+476 Sat 2 Oct 13:46:46 EEST 2021
+477 Sat 2 Oct 13:46:46 EEST 2021
+478 Sat 2 Oct 13:46:46 EEST 2021
+479 Sat 2 Oct 13:46:46 EEST 2021
+480 Sat 2 Oct 13:46:46 EEST 2021
+481 Sat 2 Oct 13:46:46 EEST 2021
+482 Sat 2 Oct 13:46:46 EEST 2021
+483 Sat 2 Oct 13:46:46 EEST 2021
+484 Sat 2 Oct 13:46:46 EEST 2021
+485 Sat 2 Oct 13:46:46 EEST 2021
+486 Sat 2 Oct 13:46:46 EEST 2021
+487 Sat 2 Oct 13:46:46 EEST 2021
+488 Sat 2 Oct 13:46:46 EEST 2021
+489 Sat 2 Oct 13:46:46 EEST 2021
+490 Sat 2 Oct 13:46:46 EEST 2021
+491 Sat 2 Oct 13:46:46 EEST 2021
+492 Sat 2 Oct 13:46:46 EEST 2021
+493 Sat 2 Oct 13:46:46 EEST 2021
+494 Sat 2 Oct 13:46:46 EEST 2021
+495 Sat 2 Oct 13:46:46 EEST 2021
+496 Sat 2 Oct 13:46:46 EEST 2021
+497 Sat 2 Oct 13:46:46 EEST 2021
+498 Sat 2 Oct 13:46:46 EEST 2021
+499 Sat 2 Oct 13:46:46 EEST 2021
+500 Sat 2 Oct 13:46:46 EEST 2021
diff --git a/integrationtests/dcat_test.go b/integrationtests/dcat_test.go
index e172bfa..5dfd08e 100644
--- a/integrationtests/dcat_test.go
+++ b/integrationtests/dcat_test.go
@@ -7,10 +7,10 @@ import (
)
func TestDCat(t *testing.T) {
- testdataFile := "dcat.txt.expected"
+ testdataFile := "dcat.txt"
stdoutFile := "dcat.out"
- _, err := runCommand(context.TODO(), stdoutFile,
+ _, err := runCommand(context.TODO(), t, stdoutFile,
"../dcat", "--spartan", testdataFile)
if err != nil {
@@ -25,3 +25,29 @@ func TestDCat(t *testing.T) {
os.Remove(stdoutFile)
}
+
+func TestDCat2(t *testing.T) {
+ testdataFile := "dcat2.txt"
+ expectedFile := "dcat2.txt.expected"
+ stdoutFile := "dcat2.out"
+
+ args := []string{"--spartan", "--logLevel", "error"}
+
+ // Cat file 100 times in one session.
+ for i := 0; i < 100; i++ {
+ args = append(args, testdataFile)
+ }
+
+ if _, err := runCommand(context.TODO(), t, stdoutFile, "../dcat", args...); err != nil {
+ t.Error(err)
+ return
+ }
+
+ if err := compareFilesContents(t, stdoutFile, expectedFile); err != nil {
+ t.Error(err)
+ return
+ }
+
+ os.Remove(stdoutFile)
+ os.Remove(expectedFile)
+}
diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go
index 15519b3..57b5d86 100644
--- a/integrationtests/dgrep_test.go
+++ b/integrationtests/dgrep_test.go
@@ -11,7 +11,7 @@ func TestDGrep(t *testing.T) {
stdoutFile := "dgrep.stdout.tmp"
expectedStdoutFile := "dgrep.txt.expected"
- _, err := runCommand(context.TODO(), stdoutFile,
+ _, err := runCommand(context.TODO(), t, stdoutFile,
"../dgrep", "--spartan", "--grep", "20211002-071947", inFile)
if err != nil {
@@ -32,7 +32,7 @@ func TestDGrep2(t *testing.T) {
stdoutFile := "dgrep2.stdout.tmp"
expectedStdoutFile := "dgrep2.txt.expected"
- _, err := runCommand(context.TODO(), stdoutFile,
+ _, err := runCommand(context.TODO(), t, stdoutFile,
"../dgrep", "-spartan", "--grep", "20211002-071947", "--invert", inFile)
if err != nil {
diff --git a/integrationtests/dmap_test.go b/integrationtests/dmap_test.go
index 966944a..59be3f4 100644
--- a/integrationtests/dmap_test.go
+++ b/integrationtests/dmap_test.go
@@ -19,7 +19,7 @@ func TestDMap(t *testing.T) {
"avg($goroutines),min(concurrentConnections),max(lifetimeConnections) "+
"group by $hostname outfile %s", csvFile)
- _, err := runCommand(context.TODO(), stdoutFile,
+ _, err := runCommand(context.TODO(), t, stdoutFile,
"../dmap", "--query", query, inFile)
if err != nil {
@@ -53,7 +53,7 @@ func TestDMap2(t *testing.T) {
"avg($goroutines),min($goroutines) group by $time order by count($time) "+
"outfile %s", csvFile)
- _, err := runCommand(context.TODO(), stdoutFile,
+ _, err := runCommand(context.TODO(), t, stdoutFile,
"../dmap", "--query", query, inFile)
if err != nil {
t.Error(err)
@@ -92,7 +92,7 @@ func TestDMap3(t *testing.T) {
args = append(args, inFile)
}
- if _, err := runCommand(context.TODO(), stdoutFile, "../dmap", args...); err != nil {
+ if _, err := runCommand(context.TODO(), t, stdoutFile, "../dmap", args...); err != nil {
t.Error(err)
return
}
diff --git a/integrationtests/dtail_test.go b/integrationtests/dtail_test.go
index 79b5881..8e932a1 100644
--- a/integrationtests/dtail_test.go
+++ b/integrationtests/dtail_test.go
@@ -27,7 +27,7 @@ func TestDTailWithServer(t *testing.T) {
}
}()
- serverCh, _, _, err := startCommand(ctx,
+ serverCh, _, _, err := startCommand(ctx, t,
"../dserver",
"--logger", "stdout",
"--logLevel", "info",
@@ -39,7 +39,7 @@ func TestDTailWithServer(t *testing.T) {
return
}
- clientCh, _, _, err := startCommand(ctx,
+ clientCh, _, _, err := startCommand(ctx, t,
"../dtail",
"--logger", "stdout",
"--logLevel", "devel",
@@ -122,7 +122,7 @@ func TestDTailColorTable(t *testing.T) {
stdoutFile := "dtailcolortable.stdout.tmp"
expectedStdoutFile := "dtailcolortable.expected"
- _, err := runCommand(context.TODO(), stdoutFile, "../dtail", "--colorTable")
+ _, err := runCommand(context.TODO(), t, stdoutFile, "../dtail", "--colorTable")
if err != nil {
t.Error(err)
return
diff --git a/integrationtests/dtailhealthcheck_test.go b/integrationtests/dtailhealthcheck_test.go
index bb6c146..6ad5dc0 100644
--- a/integrationtests/dtailhealthcheck_test.go
+++ b/integrationtests/dtailhealthcheck_test.go
@@ -12,7 +12,7 @@ func TestDTailHealthCheck(t *testing.T) {
expectedStdoutFile := "dtailhealthcheck.expected"
t.Log("Serverless check, is supposed to exit with warning state.")
- exitCode, err := runCommand(context.TODO(), stdoutFile, "../dtailhealthcheck")
+ exitCode, err := runCommand(context.TODO(), t, stdoutFile, "../dtailhealthcheck")
if exitCode != 1 {
t.Error(fmt.Sprintf("Expected exit code '1' but got '%d': %v", exitCode, err))
return
@@ -30,7 +30,7 @@ func TestDTailHealthCheck2(t *testing.T) {
expectedStdoutFile := "dtailhealthcheck2.expected"
t.Log("Negative test, is supposed to exit with a critical state.")
- exitCode, err := runCommand(context.TODO(), stdoutFile,
+ exitCode, err := runCommand(context.TODO(), t, stdoutFile,
"../dtailhealthcheck", "--server", "example:1")
if exitCode != 2 {
@@ -53,7 +53,7 @@ func TestDTailHealthCheck3(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
- _, _, _, err := startCommand(ctx,
+ _, _, _, err := startCommand(ctx, t,
"../dserver",
"--logger", "stdout",
"--logLevel", "trace",
@@ -64,7 +64,7 @@ func TestDTailHealthCheck3(t *testing.T) {
return
}
- _, err = runCommandRetry(ctx, 10, stdoutFile,
+ _, err = runCommandRetry(ctx, t, 10, stdoutFile,
"../dtailhealthcheck", "--server", "localhost:4242")
if err != nil {
t.Error(err)
diff --git a/internal/server/handlers/basehandler.go b/internal/server/handlers/basehandler.go
index d814cc9..6bc8268 100644
--- a/internal/server/handlers/basehandler.go
+++ b/internal/server/handlers/basehandler.go
@@ -63,7 +63,7 @@ func (h *baseHandler) Read(p []byte) (n int, err error) {
select {
case message := <-h.serverMessages:
- if message[0] == '.' {
+ if len(message) > 0 && message[0] == '.' {
// Handle hidden message (don't display to the user)
h.readBuf.WriteString(message)
h.readBuf.WriteByte(protocol.MessageDelimiter)
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-09 15:38:53 +0000