Add doc comment for Torrent.BytesMissing

[btrtrc.git] / iplist / iplist_test.go

diff --git a/iplist/iplist_test.go b/iplist/iplist_test.go
index 43322983ac1c4f47ddf21f818613420bb5e4db92..4e36e0aef14739fa5c710782ced01bb1c7822e82 100644 (file)
--- a/iplist/iplist_test.go
+++ b/iplist/iplist_test.go
@@ -7,7 +7,6 @@ import (
        "strings"
        "testing"
 
-       "github.com/bradfitz/iter"
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/require"
 )
@@ -41,7 +40,7 @@ func init() {
 
 func TestIPv4RangeLen(t *testing.T) {
        ranges, _ := sampleRanges(t)
-       for i := range iter.N(3) {
+       for i := 0; i < 3; i += 1 {
                if len(ranges[i].First) != 4 {
                        t.FailNow()
                }
@@ -78,15 +77,13 @@ func lookupOk(r Range, ok bool) bool {
 
 func TestBadIP(t *testing.T) {
        for _, iplist := range []Ranger{
-               New(nil),
+               // New(nil),
                NewFromPacked([]byte("\x00\x00\x00\x00\x00\x00\x00\x00")),
        } {
                assert.False(t, lookupOk(iplist.Lookup(net.IP(make([]byte, 4)))), "%v", iplist)
                assert.False(t, lookupOk(iplist.Lookup(net.IP(make([]byte, 16)))))
-               r, ok := iplist.Lookup(nil)
-               assert.True(t, ok)
-               assert.Equal(t, r.Description, "bad IP")
-               assert.True(t, lookupOk(iplist.Lookup(net.IP(make([]byte, 5)))))
+               assert.Panics(t, func() { iplist.Lookup(nil) })
+               assert.Panics(t, func() { iplist.Lookup(net.IP(make([]byte, 5))) })
        }
 }
 
@@ -101,11 +98,12 @@ func testLookuperSimple(t *testing.T, iplist Ranger) {
                {"1.2.4.255", true, "a"},
                // Try to roll over to the next octet on the parse. Note the final
                // octet is overbounds. In the next case.
-               {"1.2.7.256", true, "bad IP"},
+               // {"1.2.7.256", true, "bad IP"},
                {"1.2.8.1", true, "b"},
                {"1.2.8.2", true, "eff"},
        } {
                ip := net.ParseIP(_case.IP)
+               require.NotNil(t, ip, _case.IP)
                r, ok := iplist.Lookup(ip)
                assert.Equal(t, _case.Hit, ok, "%s", _case)
                if !_case.Hit {