From 91faac0ade3731013c659c0b259bb4d0ea8ba863 Mon Sep 17 00:00:00 2001 From: Everton Marques Date: Wed, 7 Dec 2016 19:31:08 -0200 Subject: [PATCH] Clean-up. --- dev/model_cisco_iosxr_test.go | 10 +++++++--- dev/model_cisco_test.go | 13 +++++++++---- dev/model_http_test.go | 4 +++- dev/model_junos_test.go | 7 +++++-- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dev/model_cisco_iosxr_test.go b/dev/model_cisco_iosxr_test.go index 089fc46..6679ca3 100644 --- a/dev/model_cisco_iosxr_test.go +++ b/dev/model_cisco_iosxr_test.go @@ -4,6 +4,7 @@ import ( "fmt" "io" "net" + "path/filepath" "strings" "testing" @@ -40,7 +41,8 @@ func TestCiscoIOSXR1(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 1 || bad != 0 || skip != 0 { t.Errorf("good=%d bad=%d skip=%d", good, bad, skip) @@ -75,7 +77,8 @@ func TestCiscoIOSXR2(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 1 || bad != 0 || skip != 0 { t.Errorf("good=%d bad=%d skip=%d", good, bad, skip) @@ -109,7 +112,8 @@ func TestCiscoIOSXR3(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 0 || bad != 1 || skip != 0 { t.Errorf("good=%d bad=%d skip=%d", good, bad, skip) diff --git a/dev/model_cisco_test.go b/dev/model_cisco_test.go index 0630472..72cd9ac 100644 --- a/dev/model_cisco_test.go +++ b/dev/model_cisco_test.go @@ -4,6 +4,7 @@ import ( "fmt" "io" "net" + "path/filepath" "strings" "testing" @@ -58,7 +59,8 @@ func TestCiscoIOS1(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 1 || bad != 0 || skip != 0 { t.Errorf("good=%d bad=%d skip=%d", good, bad, skip) @@ -93,7 +95,8 @@ func TestCiscoIOS2(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 1 || bad != 0 || skip != 0 { t.Errorf("good=%d bad=%d skip=%d", good, bad, skip) @@ -127,7 +130,8 @@ func TestCiscoIOS3(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 0 || bad != 1 || skip != 0 { t.Errorf("good=%d bad=%d skip=%d", good, bad, skip) @@ -166,7 +170,8 @@ func TestCiscoIOS4(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 1000 || bad != 0 || skip != 0 { t.Errorf("good=%d bad=%d", good, bad) diff --git a/dev/model_http_test.go b/dev/model_http_test.go index 635cd53..0dcc08e 100644 --- a/dev/model_http_test.go +++ b/dev/model_http_test.go @@ -4,6 +4,7 @@ import ( "io" "net" "net/http" + "path/filepath" "testing" "github.com/udhos/jazigo/conf" @@ -34,7 +35,8 @@ func TestHTTP1(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 1 || bad != 0 || skip != 0 { t.Errorf("good=%d bad=%d skip=%d", good, bad, skip) diff --git a/dev/model_junos_test.go b/dev/model_junos_test.go index d494dff..56190f4 100644 --- a/dev/model_junos_test.go +++ b/dev/model_junos_test.go @@ -3,6 +3,7 @@ package dev import ( "io" "net" + "path/filepath" "strings" "testing" @@ -35,7 +36,8 @@ func TestJuniperJunOS1(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 1 || bad != 0 || skip != 0 { t.Errorf("good=%d bad=%d skip=%d", good, bad, skip) @@ -69,7 +71,8 @@ func TestJuniperJunOS2(t *testing.T) { defer temp.CleanupTempRepo() requestCh := make(chan FetchRequest) - go Spawner(tab, logger, requestCh, repo, repo, opt, NewFilterTable(logger)) + errlogPrefix := filepath.Join(repo, "errlog_test.") + go Spawner(tab, logger, requestCh, repo, errlogPrefix, opt, NewFilterTable(logger)) good, bad, skip := Scan(tab, tab.ListDevices(), logger, opt.Get(), requestCh) if good != 0 || bad != 1 || skip != 0 { t.Errorf("good=%d bad=%d skip=%d", good, bad, skip)