Hello dave@cheney.net (cc: golang-dev@googlegroups.com), I'd like you to review this change to https://code.google.com/p/go
The flag change seems unrelated. On Tue, Feb 12, 2013 at 3:35 AM, <mikioh.mikioh@gmail.com> wrote: > Reviewers: dfc, > > Message: > Hello dave@cheney.net (cc: golang-dev@googlegroups.com), > > I'd like you to review this change to > https://code.google.com/p/go > > > Description: > net: add test for Dial and Listen arguments > > Please review this at https://codereview.appspot.**com/7305081/<https://codereview.appspot.com/7305... > > Affected files: > M src/pkg/net/dial_test.go > > > Index: src/pkg/net/dial_test.go > ==============================**==============================**======= > --- a/src/pkg/net/dial_test.go > +++ b/src/pkg/net/dial_test.go > @@ -9,6 +9,7 @@ > "fmt" > "io" > "os" > + "reflect" > "regexp" > "runtime" > "testing" > @@ -144,15 +145,13 @@ > } > } > > -var runErrorTest = flag.Bool("run_error_test", false, "let TestDialError > check for dns errors") > +var testDialError = flag.Bool("dialerror", false, "let TestDialError > check for DNS errors") > > -type DialErrorTest struct { > - Net string > - Raddr string > - Pattern string > -} > - > -var dialErrorTests = []DialErrorTest{ > +var dialErrorTests = []struct { > + net string > + raddr string > + pattern string > +}{ > { > "datakit", "mh/astro/r70", > "dial datakit mh/astro/r70: unknown network datakit", > @@ -198,23 +197,23 @@ > var duplicateErrorPattern = `dial (.*) dial (.*)` > > func TestDialError(t *testing.T) { > - if !*runErrorTest { > + if !*testDialError { > t.Logf("test disabled; use -run_error_test to enable") > return > } > for i, tt := range dialErrorTests { > - c, err := Dial(tt.Net, tt.Raddr) > + c, err := Dial(tt.net, tt.raddr) > if c != nil { > c.Close() > } > if err == nil { > - t.Errorf("#%d: nil error, want match for %#q", i, > tt.Pattern) > + t.Errorf("#%d: nil error, want match for %#q", i, > tt.pattern) > continue > } > s := err.Error() > - match, _ := regexp.MatchString(tt.Pattern, s) > + match, _ := regexp.MatchString(tt.pattern, s) > if !match { > - t.Errorf("#%d: %q, want match for %#q", i, s, > tt.Pattern) > + t.Errorf("#%d: %q, want match for %#q", i, s, > tt.pattern) > } > match, _ = regexp.MatchString(**duplicateErrorPattern, s) > if match { > @@ -223,6 +222,31 @@ > } > } > > +var invalidDialAndListenArgTests = []struct { > + net string > + addr string > + err error > +}{ > + {"foo", "bar", &OpError{Op: "dial", Net: "foo", Addr: nil, Err: > UnknownNetworkError("foo")}}, > + {"baz", "", &OpError{Op: "listen", Net: "baz", Addr: nil, Err: > UnknownNetworkError("baz")}}, > + {"tcp", "", &OpError{Op: "dial", Net: "tcp", Addr: nil, Err: > errMissingAddress}}, > +} > + > +func TestInvalidDialAndListenArgs(t *testing.T) { > + for _, tt := range invalidDialAndListenArgTests { > + var err error > + switch tt.err.(*OpError).Op { > + case "dial": > + _, err = Dial(tt.net, tt.addr) > + case "listen": > + _, err = Listen(tt.net, tt.addr) > + } > + if !reflect.DeepEqual(tt.err, err) { > + t.Fatalf("got %#v; expected %#v", err, tt.err) > + } > + } > +} > + > func TestDialTimeoutFDLeak(t *testing.T) { > if runtime.GOOS != "linux" { > // TODO(bradfitz): test on other platforms > > > -- > > ---You received this message because you are subscribed to the Google > Groups "golang-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to golang-dev+unsubscribe@**googlegroups.com<golang-dev%2Bunsubscribe@googlegrou... > . > For more options, visit https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o... > . > > >
On Wed, Feb 13, 2013 at 1:36 AM, Brad Fitzpatrick <bradfitz@golang.org> wrote: > The flag change seems unrelated. yup, separated.
Hello dave@cheney.net, bradfitz@golang.org (cc: golang-dev@googlegroups.com), Please take another look.
LGTM. I *think* these error messages are the same on Win32/Plan9.
*** Submitted as https://code.google.com/p/go/source/detail?r=535d6d34eb93 *** net: add test for Dial and Listen arguments R=dave, bradfitz CC=golang-dev https://codereview.appspot.com/7305081
