From 9975361ba22e26a5a70d05e4018d19c1fed85be0 Mon Sep 17 00:00:00 2001 From: crusader Date: Mon, 4 Dec 2017 17:16:03 +0900 Subject: [PATCH] ing --- glide.yaml | 7 ------- http/http_test.go | 6 +++--- imap/imap_test.go | 6 ++---- ldap/ldap_test.go | 5 ++--- redis/protected/redisProtected_test.go | 1 - rmi/rmi_test.go | 4 ++-- ssh/ssh_test.go | 5 ++--- wmi/wmi_test.go | 6 ++---- 8 files changed, 13 insertions(+), 27 deletions(-) diff --git a/glide.yaml b/glide.yaml index e098aaa..8cf46e4 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,13 +1,6 @@ package: git.loafle.net/commons_go/network_service_matcher import: - package: git.loafle.net/commons_go/logging -- package: git.loafle.net/overflow/overflow_discovery - subpackages: - - service/matcher - - service/matcher/snmp -- package: git.loafle.net/overflow/overflow_probe - subpackages: - - matcher/snmp testImport: - package: github.com/stretchr/testify subpackages: diff --git a/http/http_test.go b/http/http_test.go index a173f9b..253502a 100644 --- a/http/http_test.go +++ b/http/http_test.go @@ -3,16 +3,16 @@ package http import ( "fmt" - cnsm "git.loafle.net/commons_go/network_service_matcher" - //"git.loafle.net/overflow/overflow_discovery/discovery/discovery/types" "net" "testing" + + cnsm "git.loafle.net/commons_go/network_service_matcher" ) func TestHTTPMatcher_Packet(t *testing.T) { hm := NewMatcher().(*HTTPMatcher) fmt.Println(hm) - fmt.Println(hm.sendPackets[0]) + fmt.Println(hm.Packet(0)) } func TestHTTPMatcher_Match(t *testing.T) { diff --git a/imap/imap_test.go b/imap/imap_test.go index 4c53695..986c4c5 100644 --- a/imap/imap_test.go +++ b/imap/imap_test.go @@ -3,12 +3,10 @@ package imap import ( "crypto/tls" "fmt" - //"git.loafle.net/overflow/overflow_discovery/collector/core/scan/port" - cnsm "git.loafle.net/commons_go/network_service_matcher" - //"git.loafle.net/overflow/overflow_discovery/collector/core/scan/service/matcher/scaninfo" - //"git.loafle.net/overflow/overflow_discovery/collector/discovery/types" "net" "testing" + + cnsm "git.loafle.net/commons_go/network_service_matcher" ) func ImapRun(client net.Conn, t *testing.T) { diff --git a/ldap/ldap_test.go b/ldap/ldap_test.go index 7519b9a..d10e36f 100644 --- a/ldap/ldap_test.go +++ b/ldap/ldap_test.go @@ -4,11 +4,10 @@ import ( "crypto/tls" "fmt" - cnsm "git.loafle.net/commons_go/network_service_matcher" - //"git.loafle.net/overflow/overflow_discovery/collector/discovery/scan/matcher/scaninfo" - //"git.loafle.net/overflow/overflow_discovery/collector/discovery/types" "net" "testing" + + cnsm "git.loafle.net/commons_go/network_service_matcher" ) //func SetUp() { diff --git a/redis/protected/redisProtected_test.go b/redis/protected/redisProtected_test.go index 94d18a9..16d79b1 100644 --- a/redis/protected/redisProtected_test.go +++ b/redis/protected/redisProtected_test.go @@ -1,7 +1,6 @@ package protected //import ( -// "git.loafle.net/overflow/overflow_discovery/collector/core/scan/service/matcher/packet" // "net" // "testing" //) diff --git a/rmi/rmi_test.go b/rmi/rmi_test.go index 2965a76..1531d95 100644 --- a/rmi/rmi_test.go +++ b/rmi/rmi_test.go @@ -3,10 +3,10 @@ package rmi import ( "fmt" - cnsm "git.loafle.net/commons_go/network_service_matcher" - //"git.loafle.net/overflow/overflow_discovery/discovery/discovery/types" "net" "testing" + + cnsm "git.loafle.net/commons_go/network_service_matcher" ) func TestNew(t *testing.T) { diff --git a/ssh/ssh_test.go b/ssh/ssh_test.go index a798926..6b9e3da 100644 --- a/ssh/ssh_test.go +++ b/ssh/ssh_test.go @@ -2,11 +2,10 @@ package ssh import ( "fmt" - //"git.loafle.net/overflow/overflow_discovery/match/ssh" - cnsm "git.loafle.net/commons_go/network_service_matcher" - //"git.loafle.net/overflow/overflow_discovery/collector/discovery/types" "net" "testing" + + cnsm "git.loafle.net/commons_go/network_service_matcher" ) func TestSSHMatcher_Match(t *testing.T) { diff --git a/wmi/wmi_test.go b/wmi/wmi_test.go index a7fcb10..33883e5 100644 --- a/wmi/wmi_test.go +++ b/wmi/wmi_test.go @@ -2,12 +2,10 @@ package wmi import ( "fmt" - - cnsm "git.loafle.net/commons_go/network_service_matcher" - //"git.loafle.net/overflow/overflow_discovery/collector/discovery/scan/matcher/scaninfo" - //"git.loafle.net/overflow/overflow_discovery/collector/discovery/types" "net" "testing" + + cnsm "git.loafle.net/commons_go/network_service_matcher" ) func TestWMI(t *testing.T) {