aboutsummaryrefslogtreecommitdiff
path: root/spool
diff options
context:
space:
mode:
authorJulien Dessaux2021-04-23 16:51:22 +0200
committerJulien Dessaux2021-04-23 16:51:22 +0200
commit38d9c881b3b5ece91f428c87f0b7bb9efb3e88a8 (patch)
treed3f7167fae6388f4db35a63e660d1816c9c2943e /spool
parentFixed wrongfully hardcoded path in tests. (diff)
downloadbareos-zabbix-check-38d9c881b3b5ece91f428c87f0b7bb9efb3e88a8.tar.gz
bareos-zabbix-check-38d9c881b3b5ece91f428c87f0b7bb9efb3e88a8.tar.bz2
bareos-zabbix-check-38d9c881b3b5ece91f428c87f0b7bb9efb3e88a8.zip
Updated for go 1.16 modules1.2
Diffstat (limited to 'spool')
-rw-r--r--spool/parse.go27
-rw-r--r--spool/parse_test.go41
-rw-r--r--spool/serialize.go20
-rw-r--r--spool/serialize_test.go33
4 files changed, 0 insertions, 121 deletions
diff --git a/spool/parse.go b/spool/parse.go
deleted file mode 100644
index 5695890..0000000
--- a/spool/parse.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package spool
-
-import (
- "bareos-zabbix-check/job"
- "encoding/csv"
- "io"
- "strconv"
-
- "github.com/pkg/errors"
-)
-
-// Parse parses a spool file
-func Parse(handle io.Reader) (jobs []job.Job, err error) {
- lines, err := csv.NewReader(handle).ReadAll()
- if err != nil {
- return nil, errors.Wrap(err, "Corrupted spool file")
- }
- for n := 0; n < len(lines); n++ {
- line := lines[n]
- i, err := strconv.Atoi(line[1])
- if err != nil {
- return nil, errors.Wrapf(err, "Corrupted spool file : couldn't parse timestamp entry : %s", line[1])
- }
- jobs = append(jobs, job.Job{Name: line[0], Timestamp: uint64(i), Success: true})
- }
- return
-}
diff --git a/spool/parse_test.go b/spool/parse_test.go
deleted file mode 100644
index 80b961f..0000000
--- a/spool/parse_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package spool
-
-import (
- "bareos-zabbix-check/job"
- "bytes"
- "io"
- "reflect"
- "testing"
- "testing/iotest"
-)
-
-func TestParse(t *testing.T) {
- readerError := iotest.TimeoutReader(bytes.NewReader([]byte("\n")))
- readerCorruptedTimestamp := bytes.NewReader([]byte("test,x"))
- readerOneJob := bytes.NewReader([]byte("test,1"))
- type args struct {
- handle io.Reader
- }
- tests := []struct {
- name string
- args args
- wantJobs []job.Job
- wantErr bool
- }{
- {"empty", args{readerError}, nil, true},
- {"corrupted timestamp", args{readerCorruptedTimestamp}, nil, true},
- {"one job", args{readerOneJob}, []job.Job{{Name: "test", Timestamp: 1, Success: true}}, false},
- }
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- gotJobs, err := Parse(tt.args.handle)
- if (err != nil) != tt.wantErr {
- t.Errorf("Parse() error = %v, wantErr %v", err, tt.wantErr)
- return
- }
- if !reflect.DeepEqual(gotJobs, tt.wantJobs) {
- t.Errorf("Parse() = %v, want %v", gotJobs, tt.wantJobs)
- }
- })
- }
-}
diff --git a/spool/serialize.go b/spool/serialize.go
deleted file mode 100644
index 04af8da..0000000
--- a/spool/serialize.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package spool
-
-import (
- "bareos-zabbix-check/job"
- "encoding/csv"
- "fmt"
- "io"
-)
-
-// Serialize writes a spool on the disk
-func Serialize(handle io.Writer, jobs []job.Job) error {
- lines := make([][]string, len(jobs))
- for i := 0; i < len(jobs); i++ {
- job := jobs[i]
- lines[i] = make([]string, 2)
- lines[i][0] = job.Name
- lines[i][1] = fmt.Sprintf("%d", job.Timestamp)
- }
- return csv.NewWriter(handle).WriteAll(lines)
-}
diff --git a/spool/serialize_test.go b/spool/serialize_test.go
deleted file mode 100644
index 896125c..0000000
--- a/spool/serialize_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package spool
-
-import (
- "bareos-zabbix-check/job"
- "bytes"
- "testing"
-)
-
-func TestSerialize(t *testing.T) {
- type args struct {
- jobs []job.Job
- }
- tests := []struct {
- name string
- args args
- wantHandle string
- wantErr bool
- }{
- {"One job", args{[]job.Job{{Name: "a", Timestamp: 1}}}, "a,1\n", false},
- }
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- handle := &bytes.Buffer{}
- if err := Serialize(handle, tt.args.jobs); (err != nil) != tt.wantErr {
- t.Errorf("Serialize() error = %v, wantErr %v", err, tt.wantErr)
- return
- }
- if gotHandle := handle.String(); gotHandle != tt.wantHandle {
- t.Errorf("Serialize() = %v, want %v", gotHandle, tt.wantHandle)
- }
- })
- }
-}