Skip to content

Commit

Permalink
Clean-up.
Browse files Browse the repository at this point in the history
  • Loading branch information
@udhos
udhos committed Dec 7, 2016
1 parent e90011e commit 91faac0
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 10 deletions.
10 changes: 7 additions & 3 deletions dev/model_cisco_iosxr_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"io"
"net"
"path/filepath"
"strings"
"testing"

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
13 changes: 9 additions & 4 deletions dev/model_cisco_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"io"
"net"
"path/filepath"
"strings"
"testing"

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion dev/model_http_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"io"
"net"
"net/http"
"path/filepath"
"testing"

"github.com/udhos/jazigo/conf"
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 5 additions & 2 deletions dev/model_junos_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package dev
import (
"io"
"net"
"path/filepath"
"strings"
"testing"

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 91faac0

Please sign in to comment.