go-i2p/goSam
1
0
Fork 0
mirror of https://github.com/go-i2p/goSam.git synced 2025-07-13 06:07:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

tests should run in debug mode. Don't attempt to hot-restore SAM sessions by replacing the net.Conn parts inside if they go down, just let it die and tell the user to restart.

Browse Source
This commit is contained in:
idk
2022-02-01 20:03:13 -05:00
parent c6d9c0e340
commit 23c45022b3
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client_test.go
View File

@ -1,3 +1,4 @@
//go:build nettest
// +build nettest // +build nettest
package goSam package goSam
@ -45,7 +46,7 @@ func TestCompositeClient(t *testing.T) {
// http.HandleFunc("/", HelloServer) // http.HandleFunc("/", HelloServer)
go http.Serve(listener3, nil) go http.Serve(listener3, nil)
sam, err := NewClientFromOptions(SetDebug(false)) sam, err := NewClientFromOptions(SetDebug(true))
if err != nil { if err != nil {
t.Fatalf("NewDefaultClient() Error: %q\n", err) t.Fatalf("NewDefaultClient() Error: %q\n", err)
} }
@ -83,7 +84,7 @@ func TestCompositeClient(t *testing.T) {
} }
func TestClientHello(t *testing.T) { func TestClientHello(t *testing.T) {
client, err := NewClientFromOptions(SetDebug(false)) client, err := NewClientFromOptions(SetDebug(true))
if err != nil { if err != nil {
t.Fatalf("NewDefaultClient() Error: %q\n", err) t.Fatalf("NewDefaultClient() Error: %q\n", err)
} }
@ -94,7 +95,7 @@ func TestClientHello(t *testing.T) {
} }
func TestNewDestination(t *testing.T) { func TestNewDestination(t *testing.T) {
client, err := NewClientFromOptions(SetDebug(false)) client, err := NewClientFromOptions(SetDebug(true))
if err != nil { if err != nil {
t.Fatalf("NewDefaultClient() Error: %q\n", err) t.Fatalf("NewDefaultClient() Error: %q\n", err)
} }

8
dial.go
View File

@ -74,13 +74,9 @@ func (c *Client) DialStreamingContextFree(addr string) (net.Conn, error) {
} }
} }
d, err := c.NewClient(c.NewID()) err = c.StreamConnect(addr)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = d.StreamConnect(addr) return c.SamConn, nil
if err != nil {
return nil, err
}
return d.SamConn, nil
} }

3
naming_test.go
View File

@ -1,3 +1,4 @@
//go:build nettest
// +build nettest // +build nettest
package goSam package goSam
@ -10,7 +11,7 @@ import (
func TestClientLookupInvalid(t *testing.T) { func TestClientLookupInvalid(t *testing.T) {
var err error var err error
client, err := NewClientFromOptions(SetDebug(false)) client, err := NewClientFromOptions(SetDebug(true))
if err != nil { if err != nil {
t.Fatalf("NewDefaultClient() Error: %q\n", err) t.Fatalf("NewDefaultClient() Error: %q\n", err)
} }

13
options_test.go
View File

@ -1,3 +1,4 @@
//go:build nettest
// +build nettest // +build nettest
package goSam package goSam
@ -36,7 +37,7 @@ func (c *Client) validCreate() (string, error) {
} }
func TestOptionAddrString(t *testing.T) { func TestOptionAddrString(t *testing.T) {
client, err := NewClientFromOptions(SetAddr("127.0.0.1:7656"), SetDebug(false)) client, err := NewClientFromOptions(SetAddr("127.0.0.1:7656"), SetDebug(true))
if err != nil { if err != nil {
t.Fatalf("NewClientFromOptions() Error: %q\n", err) t.Fatalf("NewClientFromOptions() Error: %q\n", err)
} }
@ -55,7 +56,7 @@ func TestOptionAddrString(t *testing.T) {
} }
func TestOptionAddrStringLh(t *testing.T) { func TestOptionAddrStringLh(t *testing.T) {
client, err := NewClientFromOptions(SetAddr("localhost:7656"), SetDebug(false)) client, err := NewClientFromOptions(SetAddr("localhost:7656"), SetDebug(true))
if err != nil { if err != nil {
t.Fatalf("NewClientFromOptions() Error: %q\n", err) t.Fatalf("NewClientFromOptions() Error: %q\n", err)
} }
@ -74,7 +75,7 @@ func TestOptionAddrStringLh(t *testing.T) {
} }
func TestOptionAddrSlice(t *testing.T) { func TestOptionAddrSlice(t *testing.T) {
client, err := NewClientFromOptions(SetAddr("127.0.0.1", "7656"), SetDebug(false)) client, err := NewClientFromOptions(SetAddr("127.0.0.1", "7656"), SetDebug(true))
if err != nil { if err != nil {
t.Fatalf("NewClientFromOptions() Error: %q\n", err) t.Fatalf("NewClientFromOptions() Error: %q\n", err)
} }
@ -93,7 +94,7 @@ func TestOptionAddrSlice(t *testing.T) {
} }
func TestOptionAddrMixedSlice(t *testing.T) { func TestOptionAddrMixedSlice(t *testing.T) {
client, err := NewClientFromOptions(SetAddrMixed("127.0.0.1", 7656), SetDebug(false)) client, err := NewClientFromOptions(SetAddrMixed("127.0.0.1", 7656), SetDebug(true))
if err != nil { if err != nil {
t.Fatalf("NewClientFromOptions() Error: %q\n", err) t.Fatalf("NewClientFromOptions() Error: %q\n", err)
} }
@ -124,7 +125,7 @@ func TestOptionHost(t *testing.T) {
SetInBackups(2), SetInBackups(2),
SetOutBackups(2), SetOutBackups(2),
SetEncrypt(true), SetEncrypt(true),
SetDebug(false), SetDebug(true),
SetUnpublished(true), SetUnpublished(true),
SetReduceIdle(true), SetReduceIdle(true),
SetReduceIdleTime(300001), SetReduceIdleTime(300001),
@ -162,7 +163,7 @@ func TestOptionPortInt(t *testing.T) {
SetInBackups(2), SetInBackups(2),
SetOutBackups(2), SetOutBackups(2),
SetEncrypt(true), SetEncrypt(true),
SetDebug(false), SetDebug(true),
SetUnpublished(true), SetUnpublished(true),
SetReduceIdle(true), SetReduceIdle(true),
SetReduceIdleTime(300001), SetReduceIdleTime(300001),

5
sessions.go
View File

@ -11,8 +11,9 @@ func init() {
rand.Seed(time.Now().UnixNano()) rand.Seed(time.Now().UnixNano())
} }
// CreateSession creates a new STREAM Session. // CreateSession creates a new Session of type style, with an optional destination.
// Returns the Id for the new Client. // an empty destination is interpreted as "TRANSIENT"
// Returns the destination for the new Client or an error.
func (c *Client) CreateSession(style, dest string) (string, error) { func (c *Client) CreateSession(style, dest string) (string, error) {
if dest == "" { if dest == "" {
dest = "TRANSIENT" dest = "TRANSIENT"