Skip to content

Commit 57a1b37

Browse files
committed
Fix tests.
1 parent 12c8535 commit 57a1b37

3 files changed

Lines changed: 16 additions & 24 deletions

File tree

config_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ func TestConfigGetSpoolByName(t *testing.T) {
2323
t.Fatal(err)
2424
}
2525

26-
spool, err := config.GetSpoolByName("first")
27-
if err != nil {
28-
t.Fatal(err)
26+
spool := config.GetSpoolByName("first")
27+
if spool == nil {
28+
t.Fatal("spool first not found")
2929
}
3030
AssertEquals(t, spool.Name, "first")
3131
AssertEquals(t, spool.Directory, "/capture/first")
3232
AssertEquals(t, spool.Prefix, "first.pcap")
3333

34-
spool, err = config.GetSpoolByName("second")
35-
if err != nil {
36-
t.Fatal(err)
34+
spool = config.GetSpoolByName("second")
35+
if spool == nil {
36+
t.Fatal("spool second not found")
3737
}
3838
AssertEquals(t, spool.Name, "second")
3939
AssertEquals(t, spool.Directory, "/capture/second")
4040
AssertEquals(t, spool.Prefix, "second.pcap")
4141

42-
_, err = config.GetSpoolByName("third")
43-
if err == nil {
44-
t.Fatalf("expected error while getting non-existant spool by name")
42+
spool = config.GetSpoolByName("third")
43+
if err != nil {
44+
t.Fatalf("expected nil instead of a spool")
4545
}
4646

4747
}

time.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ func ParseTime(value string, defaultTimezoneOffset string) *time.Time {
3939
}
4040

4141
// Try adding the default timezone offset.
42-
result, err = time.Parse(time.RFC3339Nano, value+defaultTimezoneOffset)
43-
if err == nil {
44-
return &result
42+
if defaultTimezoneOffset != "" {
43+
result, err = time.Parse(time.RFC3339Nano, value+defaultTimezoneOffset)
44+
if err == nil {
45+
return &result
46+
}
4547
}
4648

4749
return nil

time_test.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func AssertEquals(t *testing.T, value interface{}, expected interface{}) {
1919
func TestParseTime(t *testing.T) {
2020

2121
// Basic RFC3339 value at UTC.
22-
value := ParseTime("2014-04-30T21:54:09Z")
22+
value := ParseTime("2014-04-30T21:54:09Z", "")
2323
if value == nil {
2424
t.Fatalf("unexpected nil")
2525
}
@@ -28,23 +28,13 @@ func TestParseTime(t *testing.T) {
2828
}
2929

3030
// With timezone offsets.
31-
value = ParseTime("2014-04-30T15:56:42-06:00")
31+
value = ParseTime("2014-04-30T15:56:42-06:00", "")
3232
if value == nil {
3333
t.Fatalf("unexpected nil")
3434
}
3535
if value.Unix() != 1398895002 {
3636
t.Fatalf("expected 1398895002, got %d", value.Unix())
3737
}
38-
39-
// Timezone offsets with the ":".
40-
value = ParseTime("2014-04-30T15:56:42-0600")
41-
if value == nil {
42-
t.Fatalf("unexpected nil")
43-
}
44-
if value.Unix() != 1398895002 {
45-
t.Fatalf("expected 1398895002, got %d", value.Unix())
46-
}
47-
4838
}
4939

5040
// Test durations the UI may present, or we provide in the

0 commit comments

Comments
 (0)