Merge lp:~andychilton/goamz/ec2 into lp:~niemeyer/goamz/ec2

[Andrew Chilton]

Fix of an integration test for when there is a non-EC2 error.

[lp:~andychilton/goamz/ec2]

34. By Andrew Chilton on 2011-08-26

Merge from trunk

=== modified file 'ec2i_test.go'
--- ec2i_test.go	2011-08-15 10:43:44 +0000
+++ ec2i_test.go	2011-08-26 12:09:32 +0000
@@ -1,6 +1,7 @@
 package ec2_test
 
 import (
+	"os"
 	. "launchpad.net/gocheck"
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/ec2"
@@ -143,21 +144,25 @@
 		ToPort:    80,
 		SourceIPs: []string{"127.0.0.1/32"},
 	}}
-	errs := make(chan *ec2.Error, len(allRegions))
+	errs := make(chan os.Error, len(allRegions))
 	for _, region := range allRegions {
 		go func(r aws.Region) {
 			e := ec2.New(s.auth, r)
 			_, err := e.AuthorizeSecurityGroup(name, perms)
-			ec2err, ok := err.(*ec2.Error)
-			if !ok {
-				c.Errorf("Non-EC2 error: %s", err)
-			} else {
-				errs <- ec2err
-			}
+			errs <- err
 		}(region)
 	}
 	for i := 0; i != len(allRegions); i++ {
 		err := <-errs
-		c.Check(err.Code, Matches, "InvalidGroup.NotFound")
+		if err != nil {
+			ec2_err, ok := err.(*ec2.Error)
+			if ok {
+				c.Check(ec2_err.Code, Matches, "InvalidGroup.NotFound")
+			} else {
+				c.Errorf("Non-EC2 error: %s", err)
+			}
+		} else {
+			c.Errorf("Test should have errored but it seems to have succeeded")
+		}
 	}
 }