Merge lp:~niemeyer/goamz/testing-cleanup into lp:~gophers/goamz/trunk

[Gustavo Niemeyer]

testutil: new package for test clean up

Killed all the repetition in suite_test files, and improved the
implementation of the test HTTP server.

A few test bugs were also fixed on the way.

https://codereview.appspot.com/7232065/

[Gustavo Niemeyer (niemeyer)]

Reviewers: mp+145878_code.launchpad.net,

Message:
Please take a look.

Description:
testutil: new package for test clean up

Killed all the repetition in suite_test files, and improved the
implementation of the test HTTP server.

A few test bugs were also fixed on the way.

https://code.launchpad.net/~niemeyer/goamz/testing-cleanup/+merge/145878

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/7232065/

Affected files:
   A [revision details]
   M aws/aws_test.go
   D aws/suite_test.go
   M ec2/ec2.go
   M ec2/ec2_test.go
   M ec2/ec2i_test.go
   M ec2/ec2t_test.go
   M ec2/ec2test/filter.go
   M ec2/ec2test/server.go
   M ec2/sign.go
   D ec2/suite_test.go
   M exp/mturk/mturk.go
   M exp/mturk/mturk_test.go
   D exp/mturk/suite_test.go
   M exp/sdb/sdb.go
   M exp/sdb/sdb_test.go
   D exp/sdb/suite_test.go
   M exp/sns/sns_test.go
   D exp/sns/suite_test.go
   M iam/iam_test.go
   M iam/iami_test.go
   D iam/suite_test.go
   M s3/s3.go
   M s3/s3_test.go
   M s3/s3i_test.go
   D s3/suite_test.go
   A testutil/http.go
   A testutil/suite.go

[Roger Peppe (rogpeppe)]

LGTM except for the query about the default security group test.

nice to see all that code factored out.

https://codereview.appspot.com/7232065/diff/1/ec2/ec2_test.go
File ec2/ec2_test.go (right):

https://codereview.appspot.com/7232065/diff/1/ec2/ec2_test.go#newcode24
ec2/ec2_test.go:24: testServer.Start()
that makes much more sense, given we're using the global below.

https://codereview.appspot.com/7232065/diff/1/ec2/ec2t_test.go
File ec2/ec2t_test.go (right):

https://codereview.appspot.com/7232065/diff/1/ec2/ec2t_test.go#newcode447
ec2/ec2t_test.go:447: //resp, err :=
s.ec2.SecurityGroups([]ec2.SecurityGroup{{Name: "default"}}, nil)
why commented out? this was testing specific ec2test functionality.

have you tried these tests live? i seem to remember that
i needed to add the "default" group because it was
being returned for some of the filtering requests.

https://codereview.appspot.com/7232065/diff/1/ec2/ec2test/server.go
File ec2/ec2test/server.go (right):

https://codereview.appspot.com/7232065/diff/1/ec2/ec2test/server.go#newcode420
ec2/ec2test/server.go:420: // ImageId: accept anything, we can verify
later
align?
(and below)

https://codereview.appspot.com/7232065/diff/1/ec2/sign.go
File ec2/sign.go (right):

https://codereview.appspot.com/7232065/diff/1/ec2/sign.go#newcode23
ec2/sign.go:23: // be in natural order of the keys. This is distinct
from the
s/in natural/in the natural/
?

https://codereview.appspot.com/7232065/diff/1/exp/mturk/suite_test.go
File exp/mturk/suite_test.go (left):

https://codereview.appspot.com/7232065/diff/1/exp/mturk/suite_test.go#oldcode1
exp/mturk/suite_test.go:1: package mturk_test
great to see all this duplication go away.

https://codereview.appspot.com/7232065/diff/1/s3/s3.go
File s3/s3.go (right):

https://codereview.appspot.com/7232065/diff/1/s3/s3.go#newcode231
s3/s3.go:231: // into different groupings of keys, similar to how
folders would work.
s/would// ?

https://codereview.appspot.com/7232065/

[Gustavo Niemeyer (niemeyer)]

https://codereview.appspot.com/7232065/diff/1/ec2/ec2t_test.go
File ec2/ec2t_test.go (right):

https://codereview.appspot.com/7232065/diff/1/ec2/ec2t_test.go#newcode447
ec2/ec2t_test.go:447: //resp, err :=
s.ec2.SecurityGroups([]ec2.SecurityGroup{{Name: "default"}}, nil)
On 2013/01/31 15:42:43, rog wrote:
> why commented out? this was testing specific ec2test functionality.

Sorry, it shouldn't be commented out. It should be removed. There's
nothing special about the default group, and the test is broken because
it trusts the system to only have a single group named default, which is
not a given.

> have you tried these tests live? i seem to remember that
> i needed to add the "default" group because it was
> being returned for some of the filtering requests.

Yeah, it was testing it live that forced me to fix it.

https://codereview.appspot.com/7232065/

[Roger Peppe (rogpeppe)]

On 31 January 2013 15:58, <email address hidden> wrote:
>
> https://codereview.appspot.com/7232065/diff/1/ec2/ec2t_test.go
> File ec2/ec2t_test.go (right):
>
> https://codereview.appspot.com/7232065/diff/1/ec2/ec2t_test.go#newcode447
> ec2/ec2t_test.go:447: //resp, err :=
> s.ec2.SecurityGroups([]ec2.SecurityGroup{{Name: "default"}}, nil)
> On 2013/01/31 15:42:43, rog wrote:
>>
>> why commented out? this was testing specific ec2test functionality.
>
>
> Sorry, it shouldn't be commented out. It should be removed. There's
> nothing special about the default group, and the test is broken because
> it trusts the system to only have a single group named default, which is
> not a given.

The default is created by automatically, can't be removed, and has
default permissions
set up for tcp and udp (which means that it gets selected by some of
the filters)

if you try to create another group called "default", you get a
"The security group 'default' is reserved" error.

That seems fairly special to me - I *think* we're always guaranteed
a single group named default... but maybe that's only true of us-east.

How did the test fail for you? I'd definitely like to understand more about
the problem before changing those tests.

[Gustavo Niemeyer (niemeyer)]

On 2013/01/31 17:01:29, rog wrote:
> The default is created by automatically, can't be removed, and has
> default permissions set up for tcp and udp (which means that it
> gets selected by some of the filters)

None of that seems relevant for filtering.

> if you try to create another group called "default", you get a
> "The security group 'default' is reserved" error.

I have two groups named "default" in my account, and that's breaking the
test case. One of them comes from VPC. Amazon created it.

> That seems fairly special to me - I *think* we're always guaranteed
> a single group named default... but maybe that's only true of us-east.

I'm not lying, promise.

https://codereview.appspot.com/7232065/

[lp:~niemeyer/goamz/testing-cleanup]

28. By Gustavo Niemeyer on 2013-01-31

Review by Roger.

[Gustavo Niemeyer (niemeyer)]

Please take a look.

https://codereview.appspot.com/7232065/diff/1/ec2/ec2test/server.go
File ec2/ec2test/server.go (right):

https://codereview.appspot.com/7232065/diff/1/ec2/ec2test/server.go#newcode420
ec2/ec2test/server.go:420: // ImageId: accept anything, we can verify
later
On 2013/01/31 15:42:43, rog wrote:
> align?
> (and below)

Done.

https://codereview.appspot.com/7232065/diff/1/ec2/sign.go
File ec2/sign.go (right):

https://codereview.appspot.com/7232065/diff/1/ec2/sign.go#newcode23
ec2/sign.go:23: // be in natural order of the keys. This is distinct
from the
On 2013/01/31 15:42:43, rog wrote:
> s/in natural/in the natural/
> ?

Done.

https://codereview.appspot.com/7232065/diff/1/s3/s3.go
File s3/s3.go (right):

https://codereview.appspot.com/7232065/diff/1/s3/s3.go#newcode231
s3/s3.go:231: // into different groupings of keys, similar to how
folders would work.
On 2013/01/31 15:42:43, rog wrote:
> s/would// ?

That's how they would work if S3 used the concept of folders. It
doesn't, so it doesn't work quite that way.

https://codereview.appspot.com/7232065/

[Gustavo Niemeyer (niemeyer)]

*** Submitted:

testutil: new package for test clean up

Killed all the repetition in suite_test files, and improved the
implementation of the test HTTP server.

A few test bugs were also fixed on the way.

R=rog
CC=
https://codereview.appspot.com/7232065

https://codereview.appspot.com/7232065/

=== modified file 'aws/aws_test.go'
--- aws/aws_test.go	2012-07-02 23:36:49 +0000
+++ aws/aws_test.go	2013-01-31 17:09:20 +0000
@@ -5,8 +5,13 @@
 	. "launchpad.net/gocheck"
 	"os"
 	"strings"
+	"testing"
 )
 
+func Test(t *testing.T) {
+	TestingT(t)
+}
+
 var _ = Suite(&S{})
 
 type S struct {
 
=== removed file 'aws/suite_test.go'
--- aws/suite_test.go	2012-05-03 17:12:28 +0000
+++ aws/suite_test.go	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-package aws_test
-
-import (
-	"flag"
-	"fmt"
-	"launchpad.net/goamz/aws"
-	. "launchpad.net/gocheck"
-	"net/http"
-	"net/url"
-	"os"
-	"testing"
-	"time"
-)
-
-func Test(t *testing.T) {
-	TestingT(t)
-}
-
-var integration = flag.Bool("i", false, "Enable integration tests")
-
-type SuiteI struct {
-	auth aws.Auth
-}
-
-func (s *SuiteI) SetUpSuite(c *C) {
-	if !*integration {
-		c.Skip("Integration tests not enabled (-int flag)")
-	}
-	auth, err := aws.EnvAuth()
-	if err != nil {
-		c.Fatal(err)
-	}
-	s.auth = auth
-}
-
-type HTTPSuite struct{}
-
-var testServer = NewTestHTTPServer("http://localhost:4444", 5*time.Second)
-
-func (s *HTTPSuite) SetUpSuite(c *C) {
-	testServer.Start()
-}
-
-func (s *HTTPSuite) TearDownTest(c *C) {
-	testServer.FlushRequests()
-}
-
-type TestHTTPServer struct {
-	URL      string
-	Timeout  time.Duration
-	started  bool
-	request  chan *http.Request
-	response chan *testResponse
-	pending  chan bool
-}
-
-type testResponse struct {
-	Status  int
-	Headers map[string]string
-	Body    string
-}
-
-func NewTestHTTPServer(url_ string, timeout time.Duration) *TestHTTPServer {
-	return &TestHTTPServer{URL: url_, Timeout: timeout}
-}
-
-func (s *TestHTTPServer) Start() {
-	if s.started {
-		return
-	}
-	s.started = true
-
-	s.request = make(chan *http.Request, 64)
-	s.response = make(chan *testResponse, 64)
-	s.pending = make(chan bool, 64)
-
-	url, _ := url.Parse(s.URL)
-	go http.ListenAndServe(url.Host, s)
-
-	s.PrepareResponse(123, nil, "")
-	for {
-		// Wait for it to be up.
-		resp, err := http.Get(s.URL)
-		if err == nil && resp.StatusCode == 123 {
-			break
-		}
-		fmt.Fprintf(os.Stderr, "\nWaiting for fake server to be up... ")
-		time.Sleep(1e8)
-	}
-	fmt.Fprintf(os.Stderr, "done\n\n")
-	s.WaitRequest() // Consume dummy request.
-}
-
-// FlushRequests discards requests which were not yet consumed by WaitRequest.
-func (s *TestHTTPServer) FlushRequests() {
-	for {
-		select {
-		case <-s.request:
-		default:
-			return
-		}
-	}
-}
-
-func (s *TestHTTPServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	s.request <- req
-	var resp *testResponse
-	select {
-	case resp = <-s.response:
-	case <-time.After(s.Timeout):
-		fmt.Fprintf(os.Stderr, "ERROR: Timeout waiting for test to provide response\n")
-		resp = &testResponse{500, nil, ""}
-	}
-	h := w.Header()
-	if resp.Headers != nil {
-		for k, v := range resp.Headers {
-			h.Set(k, v)
-		}
-	}
-	if resp.Status != 0 {
-		w.WriteHeader(resp.Status)
-	}
-	w.Write([]byte(resp.Body))
-}
-
-func (s *TestHTTPServer) WaitRequest() *http.Request {
-	select {
-	case req := <-s.request:
-		req.ParseForm()
-		return req
-	case <-time.After(s.Timeout):
-		panic("Timeout waiting for goamz request")
-	}
-	panic("unreached")
-}
-
-func (s *TestHTTPServer) PrepareResponse(status int, headers map[string]string, body string) {
-	s.response <- &testResponse{status, headers, body}
-}
 
=== modified file 'ec2/ec2.go'
--- ec2/ec2.go	2012-10-28 16:05:46 +0000
+++ ec2/ec2.go	2013-01-31 17:09:20 +0000
@@ -86,7 +86,7 @@
 // ----------------------------------------------------------------------------
 // Request dispatching logic.
 
-// Error encapsulates an error returned by EC2. 
+// Error encapsulates an error returned by EC2.
 //
 // See http://goo.gl/VZGuC for more details.
 type Error struct {
@@ -425,15 +425,15 @@
 //
 // See http://goo.gl/wnDBf for more details.
 type BlockDeviceMapping struct {
-	DeviceName          string      `xml:"deviceName"`
-	VirtualName         string      `xml:"virtualName"`
-	SnapshotId          string      `xml:"ebs>snapshotId"`
-	VolumeType          string      `xml:"ebs>volumeType"`
-	VolumeSize          int64       `xml:"ebs>volumeSize"`
-	DeleteOnTermination bool        `xml:"ebs>deleteOnTermination"`
+	DeviceName          string `xml:"deviceName"`
+	VirtualName         string `xml:"virtualName"`
+	SnapshotId          string `xml:"ebs>snapshotId"`
+	VolumeType          string `xml:"ebs>volumeType"`
+	VolumeSize          int64  `xml:"ebs>volumeSize"`
+	DeleteOnTermination bool   `xml:"ebs>deleteOnTermination"`
 
 	// The number of I/O operations per second (IOPS) that the volume supports.
-	IOPS                int64       `xml:"ebs>iops"`
+	IOPS int64 `xml:"ebs>iops"`
 }
 
 // Image represents details about an image.
@@ -467,7 +467,7 @@
 // For example, to get all the private images associated with this account set
 // the boolean filter "is-private" to true.
 //
-// Note: calling this function with nil ids and filter parameters will result in 
+// Note: calling this function with nil ids and filter parameters will result in
 // a very large number of images being returned.
 //
 // See http://goo.gl/SRBhW for more details.
@@ -512,11 +512,11 @@
 
 // DeleteSnapshots deletes the volume snapshots with the given ids.
 //
-// Note: If you make periodic snapshots of a volume, the snapshots are 
-// incremental so that only the blocks on the device that have changed 
-// since your last snapshot are incrementally saved in the new snapshot. 
-// Even though snapshots are saved incrementally, the snapshot deletion 
-// process is designed so that you need to retain only the most recent 
+// Note: If you make periodic snapshots of a volume, the snapshots are
+// incremental so that only the blocks on the device that have changed
+// since your last snapshot are incrementally saved in the new snapshot.
+// Even though snapshots are saved incrementally, the snapshot deletion
+// process is designed so that you need to retain only the most recent
 // snapshot in order to restore the volume.
 //
 // See http://goo.gl/vwU1y for more details.
@@ -558,7 +558,7 @@
 	Tags        []Tag  `xml:"tagSet>item"`
 }
 
-// Snapshots returns details about volume snapshots available to the user.  
+// Snapshots returns details about volume snapshots available to the user.
 // The ids and filter parameters, if provided, limit the snapshots returned.
 //
 // See http://goo.gl/ogJL4 for more details.
@@ -620,7 +620,7 @@
 	Groups    []SecurityGroupInfo `xml:"securityGroupInfo>item"`
 }
 
-// SecurityGroup encapsulates details for a security group in EC2. 
+// SecurityGroup encapsulates details for a security group in EC2.
 //
 // See http://goo.gl/CIdyP for more details.
 type SecurityGroupInfo struct {
@@ -785,7 +785,7 @@
 }
 
 // CreateTags adds or overwrites one or more tags for the specified instance ids.
-// 
+//
 // See http://goo.gl/Vmkqc for more details
 func (ec2 *EC2) CreateTags(instIds []string, tags []Tag) (resp *SimpleResp, err error) {
 	params := makeParams("CreateTags")
 
=== modified file 'ec2/ec2_test.go'
--- ec2/ec2_test.go	2012-10-18 18:56:09 +0000
+++ ec2/ec2_test.go	2013-01-31 17:09:20 +0000
@@ -3,24 +3,35 @@
 import (
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/ec2"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
+	"testing"
 )
 
+func Test(t *testing.T) {
+	TestingT(t)
+}
+
 var _ = Suite(&S{})
 
 type S struct {
-	HTTPSuite
 	ec2 *ec2.EC2
 }
 
+var testServer = testutil.NewHTTPServer()
+
 func (s *S) SetUpSuite(c *C) {
-	s.HTTPSuite.SetUpSuite(c)
+	testServer.Start()
 	auth := aws.Auth{"abc", "123"}
 	s.ec2 = ec2.New(auth, aws.Region{EC2Endpoint: testServer.URL})
 }
 
+func (s *S) TearDownTest(c *C) {
+	testServer.Flush()
+}
+
 func (s *S) TestRunInstancesErrorDump(c *C) {
-	testServer.PrepareResponse(400, nil, ErrorDump)
+	testServer.Response(400, nil, ErrorDump)
 
 	options := ec2.RunInstances{
 		ImageId:      "ami-a6f504cf", // Ubuntu Maverick, i386, instance store
@@ -45,7 +56,7 @@
 }
 
 func (s *S) TestRunInstancesErrorWithoutXML(c *C) {
-	testServer.PrepareResponse(500, nil, "")
+	testServer.Response(500, nil, "")
 	options := ec2.RunInstances{ImageId: "image-id"}
 
 	resp, err := s.ec2.RunInstances(&options)
@@ -64,7 +75,7 @@
 }
 
 func (s *S) TestRunInstancesExample(c *C) {
-	testServer.PrepareResponse(200, nil, RunInstancesExample)
+	testServer.Response(200, nil, RunInstancesExample)
 
 	options := ec2.RunInstances{
 		KeyName:               "my-keys",
@@ -145,7 +156,7 @@
 }
 
 func (s *S) TestTerminateInstancesExample(c *C) {
-	testServer.PrepareResponse(200, nil, TerminateInstancesExample)
+	testServer.Response(200, nil, TerminateInstancesExample)
 
 	resp, err := s.ec2.TerminateInstances([]string{"i-1", "i-2"})
 
@@ -175,7 +186,7 @@
 }
 
 func (s *S) TestDescribeInstancesExample1(c *C) {
-	testServer.PrepareResponse(200, nil, DescribeInstancesExample1)
+	testServer.Response(200, nil, DescribeInstancesExample1)
 
 	filter := ec2.NewFilter()
 	filter.Add("key1", "value1")
@@ -207,7 +218,7 @@
 }
 
 func (s *S) TestDescribeInstancesExample2(c *C) {
-	testServer.PrepareResponse(200, nil, DescribeInstancesExample2)
+	testServer.Response(200, nil, DescribeInstancesExample2)
 
 	filter := ec2.NewFilter()
 	filter.Add("key1", "value1")
@@ -244,7 +255,7 @@
 }
 
 func (s *S) TestDescribeImagesExample(c *C) {
-	testServer.PrepareResponse(200, nil, DescribeImagesExample)
+	testServer.Response(200, nil, DescribeImagesExample)
 
 	filter := ec2.NewFilter()
 	filter.Add("key1", "value1")
@@ -292,7 +303,7 @@
 }
 
 func (s *S) TestCreateSnapshotExample(c *C) {
-	testServer.PrepareResponse(200, nil, CreateSnapshotExample)
+	testServer.Response(200, nil, CreateSnapshotExample)
 
 	resp, err := s.ec2.CreateSnapshot("vol-4d826724", "Daily Backup")
 
@@ -314,7 +325,7 @@
 }
 
 func (s *S) TestDeleteSnapshotsExample(c *C) {
-	testServer.PrepareResponse(200, nil, DeleteSnapshotExample)
+	testServer.Response(200, nil, DeleteSnapshotExample)
 
 	resp, err := s.ec2.DeleteSnapshots([]string{"snap-78a54011"})
 
@@ -327,7 +338,7 @@
 }
 
 func (s *S) TestDescribeSnapshotsExample(c *C) {
-	testServer.PrepareResponse(200, nil, DescribeSnapshotsExample)
+	testServer.Response(200, nil, DescribeSnapshotsExample)
 
 	filter := ec2.NewFilter()
 	filter.Add("key1", "value1")
@@ -366,7 +377,7 @@
 }
 
 func (s *S) TestCreateSecurityGroupExample(c *C) {
-	testServer.PrepareResponse(200, nil, CreateSecurityGroupExample)
+	testServer.Response(200, nil, CreateSecurityGroupExample)
 
 	resp, err := s.ec2.CreateSecurityGroup("websrv", "Web Servers")
 
@@ -382,7 +393,7 @@
 }
 
 func (s *S) TestDescribeSecurityGroupsExample(c *C) {
-	testServer.PrepareResponse(200, nil, DescribeSecurityGroupsExample)
+	testServer.Response(200, nil, DescribeSecurityGroupsExample)
 
 	resp, err := s.ec2.SecurityGroups([]ec2.SecurityGroup{{Name: "WebServers"}, {Name: "RangedPortsBySource"}}, nil)
 
@@ -423,7 +434,7 @@
 }
 
 func (s *S) TestDescribeSecurityGroupsExampleWithFilter(c *C) {
-	testServer.PrepareResponse(200, nil, DescribeSecurityGroupsExample)
+	testServer.Response(200, nil, DescribeSecurityGroupsExample)
 
 	filter := ec2.NewFilter()
 	filter.Add("ip-permission.protocol", "tcp")
@@ -449,7 +460,7 @@
 }
 
 func (s *S) TestDescribeSecurityGroupsDumpWithGroup(c *C) {
-	testServer.PrepareResponse(200, nil, DescribeSecurityGroupsDump)
+	testServer.Response(200, nil, DescribeSecurityGroupsDump)
 
 	resp, err := s.ec2.SecurityGroups(nil, nil)
 
@@ -477,7 +488,7 @@
 }
 
 func (s *S) TestDeleteSecurityGroupExample(c *C) {
-	testServer.PrepareResponse(200, nil, DeleteSecurityGroupExample)
+	testServer.Response(200, nil, DeleteSecurityGroupExample)
 
 	resp, err := s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Name: "websrv"})
 	req := testServer.WaitRequest()
@@ -490,7 +501,7 @@
 }
 
 func (s *S) TestDeleteSecurityGroupExampleWithId(c *C) {
-	testServer.PrepareResponse(200, nil, DeleteSecurityGroupExample)
+	testServer.Response(200, nil, DeleteSecurityGroupExample)
 
 	// ignore return and error - we're only want to check the parameter handling.
 	s.ec2.DeleteSecurityGroup(ec2.SecurityGroup{Id: "sg-67ad940e", Name: "ignored"})
@@ -501,7 +512,7 @@
 }
 
 func (s *S) TestAuthorizeSecurityGroupExample1(c *C) {
-	testServer.PrepareResponse(200, nil, AuthorizeSecurityGroupIngressExample)
+	testServer.Response(200, nil, AuthorizeSecurityGroupIngressExample)
 
 	perms := []ec2.IPPerm{{
 		Protocol:  "tcp",
@@ -526,7 +537,7 @@
 }
 
 func (s *S) TestAuthorizeSecurityGroupExample1WithId(c *C) {
-	testServer.PrepareResponse(200, nil, AuthorizeSecurityGroupIngressExample)
+	testServer.Response(200, nil, AuthorizeSecurityGroupIngressExample)
 
 	perms := []ec2.IPPerm{{
 		Protocol:  "tcp",
@@ -544,7 +555,7 @@
 }
 
 func (s *S) TestAuthorizeSecurityGroupExample2(c *C) {
-	testServer.PrepareResponse(200, nil, AuthorizeSecurityGroupIngressExample)
+	testServer.Response(200, nil, AuthorizeSecurityGroupIngressExample)
 
 	perms := []ec2.IPPerm{{
 		Protocol: "tcp",
@@ -577,7 +588,7 @@
 func (s *S) TestRevokeSecurityGroupExample(c *C) {
 	// RevokeSecurityGroup is implemented by the same code as AuthorizeSecurityGroup
 	// so there's no need to duplicate all the tests.
-	testServer.PrepareResponse(200, nil, RevokeSecurityGroupIngressExample)
+	testServer.Response(200, nil, RevokeSecurityGroupIngressExample)
 
 	resp, err := s.ec2.RevokeSecurityGroup(ec2.SecurityGroup{Name: "websrv"}, nil)
 
@@ -590,7 +601,7 @@
 }
 
 func (s *S) TestCreateTags(c *C) {
-	testServer.PrepareResponse(200, nil, CreateTagsExample)
+	testServer.Response(200, nil, CreateTagsExample)
 
 	resp, err := s.ec2.CreateTags([]string{"ami-1a2b3c4d", "i-7f4d3a2b"}, []ec2.Tag{{"webserver", ""}, {"stack", "Production"}})
 
@@ -607,7 +618,7 @@
 }
 
 func (s *S) TestStartInstances(c *C) {
-	testServer.PrepareResponse(200, nil, StartInstancesExample)
+	testServer.Response(200, nil, StartInstancesExample)
 
 	resp, err := s.ec2.StartInstances("i-10a64379")
 	req := testServer.WaitRequest()
@@ -627,7 +638,7 @@
 }
 
 func (s *S) TestStopInstances(c *C) {
-	testServer.PrepareResponse(200, nil, StopInstancesExample)
+	testServer.Response(200, nil, StopInstancesExample)
 
 	resp, err := s.ec2.StopInstances("i-10a64379")
 	req := testServer.WaitRequest()
@@ -647,7 +658,7 @@
 }
 
 func (s *S) TestRebootInstances(c *C) {
-	testServer.PrepareResponse(200, nil, RebootInstancesExample)
+	testServer.Response(200, nil, RebootInstancesExample)
 
 	resp, err := s.ec2.RebootInstances("i-10a64379")
 	req := testServer.WaitRequest()
@@ -663,7 +674,7 @@
 	ec2.FakeTime(true)
 	defer ec2.FakeTime(false)
 
-	testServer.PrepareResponse(200, nil, RebootInstancesExample)
+	testServer.Response(200, nil, RebootInstancesExample)
 
 	// https://bugs.launchpad.net/goamz/+bug/1022749
 	ec2 := ec2.New(s.ec2.Auth, aws.Region{EC2Endpoint: testServer.URL + "/services/Cloud"})
 
=== modified file 'ec2/ec2i_test.go'
--- ec2/ec2i_test.go	2012-10-28 16:05:46 +0000
+++ ec2/ec2i_test.go	2013-01-31 17:09:20 +0000
@@ -2,15 +2,13 @@
 
 import (
 	"crypto/rand"
-	"flag"
 	"fmt"
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/ec2"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
 )
 
-var amazon = flag.Bool("amazon", false, "Enable tests against amazon server")
-
 // AmazonServer represents an Amazon EC2 server.
 type AmazonServer struct {
 	auth aws.Auth
@@ -34,7 +32,7 @@
 }
 
 func (s *AmazonClientSuite) SetUpSuite(c *C) {
-	if !*amazon {
+	if !testutil.Amazon {
 		c.Skip("AmazonClientSuite tests not enabled")
 	}
 	s.srv.SetUp(c)
 
=== modified file 'ec2/ec2t_test.go'
--- ec2/ec2t_test.go	2012-10-28 16:05:46 +0000
+++ ec2/ec2t_test.go	2013-01-31 17:09:20 +0000
@@ -5,6 +5,7 @@
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/ec2"
 	"launchpad.net/goamz/ec2/ec2test"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
 	"regexp"
 	"sort"
@@ -88,7 +89,7 @@
 var _ = Suite(&AmazonServerSuite{})
 
 func (s *AmazonServerSuite) SetUpSuite(c *C) {
-	if !*amazon {
+	if !testutil.Amazon {
 		c.Skip("AmazonServerSuite tests not enabled")
 	}
 	s.srv.SetUp(c)
@@ -435,17 +436,13 @@
 
 func (s *ServerTests) TestGroupFiltering(c *C) {
 	g := make([]ec2.SecurityGroup, 4)
-	for i := range g[0:3] {
+	for i := range g {
 		resp, err := s.ec2.CreateSecurityGroup(sessionName(fmt.Sprintf("testgroup%d", i)), fmt.Sprintf("testdescription%d", i))
 		c.Assert(err, IsNil)
 		g[i] = resp.SecurityGroup
 		c.Logf("group %d: %v", i, g[i])
 		defer s.ec2.DeleteSecurityGroup(g[i])
 	}
-	// Get the default group.
-	resp, err := s.ec2.SecurityGroups([]ec2.SecurityGroup{{Name: "default"}}, nil)
-	c.Assert(err, IsNil)
-	g[3] = resp.Groups[0].SecurityGroup
 
 	perms := [][]ec2.IPPerm{
 		{{
@@ -536,7 +533,7 @@
 		filterCheck("group-name", g[2].Name, groups(2)),
 		filterCheck("ip-permission.cidr", "1.2.3.4/32", groups(0)),
 		filterCheck("ip-permission.group-name", g[1].Name, groups(1, 2)),
-		filterCheck("ip-permission.protocol", "udp", groups(2, 3)),
+		filterCheck("ip-permission.protocol", "udp", groups(2)),
 		filterCheck("ip-permission.from-port", "200", groups(1, 2)),
 		filterCheck("ip-permission.to-port", "200", groups(0)),
 		// TODO owner-id
@@ -568,7 +565,7 @@
 		if t.allowExtra {
 			namePat := regexp.MustCompile(sessionName("testgroup[0-9]"))
 			for id, g := range groups {
-				if g.Name != "default" && !namePat.MatchString(g.Name) {
+				if !namePat.MatchString(g.Name) {
 					delete(groups, id)
 				}
 			}
 
=== modified file 'ec2/ec2test/filter.go'
--- ec2/ec2test/filter.go	2012-03-09 14:02:34 +0000
+++ ec2/ec2test/filter.go	2013-01-31 17:09:20 +0000
@@ -13,13 +13,13 @@
 type filter map[string][]string
 
 // newFilter creates a new filter from the Filter fields in the url form.
-// 
+//
 // The filtering is specified through a map of name=>values, where the
 // name is a well-defined key identifying the data to be matched,
 // and the list of values holds the possible values the filtered
 // item can take for the key to be included in the
 // result set. For example:
-// 
+//
 //   Filter.1.Name=instance-type
 //   Filter.1.Value.1=m1.small
 //   Filter.1.Value.2=m1.large
 
=== modified file 'ec2/ec2test/server.go'
--- ec2/ec2test/server.go	2012-09-11 14:10:43 +0000
+++ ec2/ec2test/server.go	2013-01-31 17:09:20 +0000
@@ -417,18 +417,18 @@
 	}
 
 	// TODO attributes still to consider:
-	//	ImageId: 			accept anything, we can verify later
-	//	KeyName          		?
-	//	InstanceType    	?
-	//	KernelId              	?
-	//	RamdiskId             	?
-	//	AvailZone             	?
-	//	GroupName             	tag
-	//	Monitoring            	ignore?
-	//	SubnetId           		?   	
-	//	DisableAPITermination bool
-	//	ShutdownBehavior      string
-	//	PrivateIPAddress      string
+	//    ImageId:                  accept anything, we can verify later
+	//    KeyName                   ?
+	//    InstanceType              ?
+	//    KernelId                  ?
+	//    RamdiskId                 ?
+	//    AvailZone                 ?
+	//    GroupName                 tag
+	//    Monitoring                ignore?
+	//    SubnetId                  ?
+	//    DisableAPITermination     bool
+	//    ShutdownBehavior          string
+	//    PrivateIPAddress          string
 
 	srv.mu.Lock()
 	defer srv.mu.Unlock()
 
=== modified file 'ec2/sign.go'
--- ec2/sign.go	2012-10-28 16:04:45 +0000
+++ ec2/sign.go	2013-01-31 17:09:20 +0000
@@ -19,10 +19,10 @@
 	params["SignatureVersion"] = "2"
 	params["SignatureMethod"] = "HmacSHA256"
 
-	// AWS specifies that the parameters in a signed request must 
-	// be in natural order of the keys. This is distinct from the 
-	// natural order of the encoded value of key=value. Basically
-	// percent and equals affect the sorting order.
+	// AWS specifies that the parameters in a signed request must
+	// be provided in the natural order of the keys. This is distinct
+	// from the natural order of the encoded value of key=value.
+	// Percent and equals affect the sorting order.
 	var keys, sarray []string
 	for k, _ := range params {
 		keys = append(keys, k)
 
=== removed file 'ec2/suite_test.go'
--- ec2/suite_test.go	2012-08-31 08:11:21 +0000
+++ ec2/suite_test.go	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-package ec2_test
-
-import (
-	"fmt"
-	. "launchpad.net/gocheck"
-	"net/http"
-	"net/url"
-	"os"
-	"testing"
-	"time"
-)
-
-func Test(t *testing.T) {
-	TestingT(t)
-}
-
-type HTTPSuite struct{}
-
-var testServer = NewTestHTTPServer("http://localhost:4444", 5*time.Second)
-
-func (s *HTTPSuite) SetUpSuite(c *C) {
-	testServer.Start()
-}
-
-func (s *HTTPSuite) TearDownTest(c *C) {
-	testServer.FlushRequests()
-}
-
-type TestHTTPServer struct {
-	URL      string
-	Timeout  time.Duration
-	started  bool
-	request  chan *http.Request
-	response chan *testResponse
-	pending  chan bool
-}
-
-type testResponse struct {
-	Status  int
-	Headers map[string]string
-	Body    string
-}
-
-func NewTestHTTPServer(url string, timeout time.Duration) *TestHTTPServer {
-	return &TestHTTPServer{URL: url, Timeout: timeout}
-}
-
-func (s *TestHTTPServer) Start() {
-	if s.started {
-		return
-	}
-	s.started = true
-
-	s.request = make(chan *http.Request, 64)
-	s.response = make(chan *testResponse, 64)
-	s.pending = make(chan bool, 64)
-
-	url, _ := url.Parse(s.URL)
-	go http.ListenAndServe(url.Host, s)
-
-	s.PrepareResponse(202, nil, "Nothing.")
-	for {
-		// Wait for it to be up.
-		resp, err := http.Get(s.URL)
-		if err == nil && resp.StatusCode == 202 {
-			break
-		}
-		time.Sleep(1e8)
-	}
-	s.WaitRequest() // Consume dummy request.
-}
-
-// FlushRequests discards requests which were not yet consumed by WaitRequest.
-func (s *TestHTTPServer) FlushRequests() {
-	for {
-		select {
-		case <-s.request:
-		default:
-			return
-		}
-	}
-}
-
-func (s *TestHTTPServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	s.request <- req
-	var resp *testResponse
-	select {
-	case resp = <-s.response:
-	case <-time.After(s.Timeout):
-		fmt.Fprintf(os.Stderr, "ERROR: Timeout waiting for test to provide response\n")
-		resp = &testResponse{500, nil, ""}
-	}
-	if resp.Headers != nil {
-		h := w.Header()
-		for k, v := range resp.Headers {
-			h.Set(k, v)
-		}
-	}
-	if resp.Status != 0 {
-		w.WriteHeader(resp.Status)
-	}
-	w.Write([]byte(resp.Body))
-}
-
-func (s *TestHTTPServer) WaitRequest() *http.Request {
-	select {
-	case req := <-s.request:
-		req.ParseForm()
-		return req
-	case <-time.After(s.Timeout):
-		panic("Timeout waiting for goamz request")
-	}
-	panic("unreached")
-}
-
-func (s *TestHTTPServer) PrepareResponse(status int, headers map[string]string, body string) {
-	s.response <- &testResponse{status, headers, body}
-}
 
=== modified file 'exp/mturk/mturk.go'
--- exp/mturk/mturk.go	2012-05-03 17:12:28 +0000
+++ exp/mturk/mturk.go	2013-01-31 17:09:20 +0000
@@ -43,7 +43,7 @@
 // ----------------------------------------------------------------------------
 // Request dispatching logic.
 
-// Error encapsulates an error returned by MTurk. 
+// Error encapsulates an error returned by MTurk.
 type Error struct {
 	StatusCode int    // HTTP status code (200, 403, ...)
 	Code       string // EC2 error code ("UnsupportedOperation", ...)
@@ -150,7 +150,7 @@
 // Corresponds to the "CreateHIT" operation of the Mechanical Turk
 // API.  http://goo.gl/cDBRc Currently only supports "external"
 // questions (see "HIT" struct above).  If "keywords", "maxAssignments",
-// "qualificationRequirement" or "requesterAnnotation" are the zero 
+// "qualificationRequirement" or "requesterAnnotation" are the zero
 // value for their types, they will not be included in the request.
 func (mt *MTurk) CreateHIT(title, description string, question ExternalQuestion, reward Price, assignmentDurationInSeconds, lifetimeInSeconds uint, keywords string, maxAssignments uint, qualificationRequirement *QualificationRequirement, requesterAnnotation string) (h *HIT, err error) {
 	params := make(map[string]string)
@@ -191,8 +191,8 @@
 
 // Corresponds to the "CreateHIT" operation of the Mechanical Turk
 // API, using an existing "hit type".  http://goo.gl/cDBRc Currently only
-// supports "external" questions (see "HIT" struct above).  If 
-// "maxAssignments" or "requesterAnnotation" are the zero value for 
+// supports "external" questions (see "HIT" struct above).  If
+// "maxAssignments" or "requesterAnnotation" are the zero value for
 // their types, they will not be included in the request.
 func (mt *MTurk) CreateHITOfType(hitTypeId string, q ExternalQuestion, lifetimeInSeconds uint, maxAssignments uint, requesterAnnotation string) (h *HIT, err error) {
 	params := make(map[string]string)
@@ -217,7 +217,7 @@
 	return
 }
 
-// Corresponds to "SearchHITs" operation of Mechanical Turk. http://goo.gl/PskcX 
+// Corresponds to "SearchHITs" operation of Mechanical Turk. http://goo.gl/PskcX
 // Currenlty supports none of the optional parameters.
 func (mt *MTurk) SearchHITs() (s *SearchHITsResult, err error) {
 	params := make(map[string]string)
 
=== modified file 'exp/mturk/mturk_test.go'
--- exp/mturk/mturk_test.go	2012-05-03 17:12:28 +0000
+++ exp/mturk/mturk_test.go	2013-01-31 17:09:20 +0000
@@ -3,19 +3,26 @@
 import (
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/exp/mturk"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
 	"net/url"
+	"testing"
 )
 
+func Test(t *testing.T) {
+	TestingT(t)
+}
+
 var _ = Suite(&S{})
 
 type S struct {
-	HTTPSuite
 	mturk *mturk.MTurk
 }
 
+var testServer = testutil.NewHTTPServer()
+
 func (s *S) SetUpSuite(c *C) {
-	s.HTTPSuite.SetUpSuite(c)
+	testServer.Start()
 	auth := aws.Auth{"abc", "123"}
 	u, err := url.Parse(testServer.URL)
 	if err != nil {
@@ -28,8 +35,12 @@
 	}
 }
 
+func (s *S) TearDownTest(c *C) {
+	testServer.Flush()
+}
+
 func (s *S) TestCreateHIT(c *C) {
-	testServer.PrepareResponse(200, nil, BasicHitResponse)
+	testServer.Response(200, nil, BasicHitResponse)
 
 	question := mturk.ExternalQuestion{
 		ExternalURL: "http://www.amazon.com",
@@ -51,7 +62,7 @@
 }
 
 func (s *S) TestSearchHITs(c *C) {
-	testServer.PrepareResponse(200, nil, SearchHITResponse)
+	testServer.Response(200, nil, SearchHITResponse)
 
 	hitResult, err := s.mturk.SearchHITs()
 
 
=== removed file 'exp/mturk/suite_test.go'
--- exp/mturk/suite_test.go	2012-03-09 15:34:56 +0000
+++ exp/mturk/suite_test.go	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-package mturk_test
-
-import (
-	"fmt"
-	. "launchpad.net/gocheck"
-	"net/http"
-	"net/url"
-	"os"
-	"testing"
-	"time"
-)
-
-func Test(t *testing.T) {
-	TestingT(t)
-}
-
-type HTTPSuite struct{}
-
-var testServer = NewTestHTTPServer("http://localhost:4444", 5*time.Second)
-
-func (s *HTTPSuite) SetUpSuite(c *C) {
-	testServer.Start()
-}
-
-func (s *HTTPSuite) TearDownTest(c *C) {
-	testServer.FlushRequests()
-}
-
-type TestHTTPServer struct {
-	URL      string
-	Timeout  time.Duration
-	started  bool
-	request  chan *http.Request
-	response chan *testResponse
-	pending  chan bool
-}
-
-type testResponse struct {
-	Status  int
-	Headers map[string]string
-	Body    string
-}
-
-func NewTestHTTPServer(url string, timeout time.Duration) *TestHTTPServer {
-	return &TestHTTPServer{URL: url, Timeout: timeout}
-}
-
-func (s *TestHTTPServer) Start() {
-	if s.started {
-		return
-	}
-	s.started = true
-
-	s.request = make(chan *http.Request, 64)
-	s.response = make(chan *testResponse, 64)
-	s.pending = make(chan bool, 64)
-
-	url, _ := url.Parse(s.URL)
-	go http.ListenAndServe(url.Host, s)
-
-	s.PrepareResponse(202, nil, "Nothing.")
-	for {
-		// Wait for it to be up.
-		resp, err := http.Get(s.URL)
-		if err == nil && resp.StatusCode == 202 {
-			break
-		}
-		fmt.Fprintf(os.Stderr, "\nWaiting for fake server to be up... ")
-		time.Sleep(1e8)
-	}
-	fmt.Fprintf(os.Stderr, "done\n\n")
-	s.WaitRequest() // Consume dummy request.
-}
-
-// FlushRequests discards requests which were not yet consumed by WaitRequest.
-func (s *TestHTTPServer) FlushRequests() {
-	for {
-		select {
-		case <-s.request:
-		default:
-			return
-		}
-	}
-}
-
-func (s *TestHTTPServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	s.request <- req
-	var resp *testResponse
-	select {
-	case resp = <-s.response:
-	case <-time.After(s.Timeout):
-		fmt.Fprintf(os.Stderr, "ERROR: Timeout waiting for test to provide response\n")
-		resp = &testResponse{500, nil, ""}
-	}
-	if resp.Headers != nil {
-		h := w.Header()
-		for k, v := range resp.Headers {
-			h.Set(k, v)
-		}
-	}
-	if resp.Status != 0 {
-		w.WriteHeader(resp.Status)
-	}
-	w.Write([]byte(resp.Body))
-}
-
-func (s *TestHTTPServer) WaitRequest() *http.Request {
-	select {
-	case req := <-s.request:
-		req.ParseForm()
-		return req
-	case <-time.After(s.Timeout):
-		panic("Timeout waiting for goamz request")
-	}
-	panic("unreached")
-}
-
-func (s *TestHTTPServer) PrepareResponse(status int, headers map[string]string, body string) {
-	s.response <- &testResponse{status, headers, body}
-}
 
=== modified file 'exp/sdb/sdb.go'
--- exp/sdb/sdb.go	2012-03-09 15:34:56 +0000
+++ exp/sdb/sdb.go	2013-01-31 17:09:20 +0000
@@ -18,7 +18,7 @@
 
 // BUG: SelectResp isn't properly organized. It must change.
 
-// 
+//
 
 import (
 	"encoding/xml"
@@ -129,7 +129,7 @@
 
 // Select returns a set of items and attributes that match expr.
 // Select is similar to the standard SQL SELECT statement.
-// 
+//
 // See http://goo.gl/GTsSZ for more details.
 func (sdb *SDB) Select(expr string, consistent bool) (resp *SelectResp, err error) {
 	resp = &SelectResp{}
@@ -206,7 +206,7 @@
 	pa.missing[name] = true
 }
 
-// PutAttrs adds attrs to item.	
+// PutAttrs adds attrs to item.
 //
 // See http://goo.gl/yTAV4 for more details.
 func (item *Item) PutAttrs(attrs *PutAttrs) (resp *SimpleResp, err error) {
 
=== modified file 'exp/sdb/sdb_test.go'
--- exp/sdb/sdb_test.go	2012-03-09 15:34:56 +0000
+++ exp/sdb/sdb_test.go	2013-01-31 17:09:20 +0000
@@ -3,24 +3,35 @@
 import (
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/exp/sdb"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
+	"testing"
 )
 
+func Test(t *testing.T) {
+	TestingT(t)
+}
+
 var _ = Suite(&S{})
 
 type S struct {
-	HTTPSuite
 	sdb *sdb.SDB
 }
 
+var testServer = testutil.NewHTTPServer()
+
 func (s *S) SetUpSuite(c *C) {
-	s.HTTPSuite.SetUpSuite(c)
+	testServer.Start()
 	auth := aws.Auth{"abc", "123"}
 	s.sdb = sdb.New(auth, aws.Region{SDBEndpoint: testServer.URL})
 }
 
+func (s *S) TearDownTest(c *C) {
+	testServer.Flush()
+}
+
 func (s *S) TestCreateDomainOK(c *C) {
-	testServer.PrepareResponse(200, nil, TestCreateDomainXmlOK)
+	testServer.Response(200, nil, TestCreateDomainXmlOK)
 
 	domain := s.sdb.Domain("domain")
 	resp, err := domain.CreateDomain()
@@ -37,7 +48,7 @@
 }
 
 func (s *S) TestListDomainsOK(c *C) {
-	testServer.PrepareResponse(200, nil, TestListDomainsXmlOK)
+	testServer.Response(200, nil, TestListDomainsXmlOK)
 
 	resp, err := s.sdb.ListDomains()
 	req := testServer.WaitRequest()
@@ -54,7 +65,7 @@
 }
 
 func (s *S) TestListDomainsWithNextTokenXmlOK(c *C) {
-	testServer.PrepareResponse(200, nil, TestListDomainsWithNextTokenXmlOK)
+	testServer.Response(200, nil, TestListDomainsWithNextTokenXmlOK)
 
 	resp, err := s.sdb.ListDomains()
 	req := testServer.WaitRequest()
@@ -72,7 +83,7 @@
 }
 
 func (s *S) TestDeleteDomainOK(c *C) {
-	testServer.PrepareResponse(200, nil, TestDeleteDomainXmlOK)
+	testServer.Response(200, nil, TestDeleteDomainXmlOK)
 
 	domain := s.sdb.Domain("domain")
 	resp, err := domain.DeleteDomain()
@@ -89,7 +100,7 @@
 }
 
 func (s *S) TestPutAttrsOK(c *C) {
-	testServer.PrepareResponse(200, nil, TestPutAttrsXmlOK)
+	testServer.Response(200, nil, TestPutAttrsXmlOK)
 
 	domain := s.sdb.Domain("MyDomain")
 	item := domain.Item("Item123")
@@ -128,7 +139,7 @@
 }
 
 func (s *S) TestAttrsOK(c *C) {
-	testServer.PrepareResponse(200, nil, TestAttrsXmlOK)
+	testServer.Response(200, nil, TestAttrsXmlOK)
 
 	domain := s.sdb.Domain("MyDomain")
 	item := domain.Item("Item123")
@@ -155,7 +166,7 @@
 }
 
 func (s *S) TestAttrsSelectOK(c *C) {
-	testServer.PrepareResponse(200, nil, TestAttrsXmlOK)
+	testServer.Response(200, nil, TestAttrsXmlOK)
 
 	domain := s.sdb.Domain("MyDomain")
 	item := domain.Item("Item123")
@@ -184,7 +195,7 @@
 }
 
 func (s *S) TestSelectOK(c *C) {
-	testServer.PrepareResponse(200, nil, TestSelectXmlOK)
+	testServer.Response(200, nil, TestSelectXmlOK)
 
 	resp, err := s.sdb.Select("select Color from MyDomain where Color like 'Blue%'", true)
 	req := testServer.WaitRequest()
 
=== removed file 'exp/sdb/suite_test.go'
--- exp/sdb/suite_test.go	2012-03-09 15:34:56 +0000
+++ exp/sdb/suite_test.go	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-package sdb_test
-
-import (
-	"flag"
-	"fmt"
-	"launchpad.net/goamz/aws"
-	"launchpad.net/gocheck"
-	"net/http"
-	"net/url"
-	"os"
-	"testing"
-	"time"
-)
-
-func Test(t *testing.T) {
-	gocheck.TestingT(t)
-}
-
-var integration = flag.Bool("i", false, "Enable integration tests")
-
-type SuiteI struct {
-	auth aws.Auth
-}
-
-func (s *SuiteI) SetUpSuite(c *gocheck.C) {
-	if !*integration {
-		c.Skip("Integration tests not enabled (-int flag)")
-	}
-	auth, err := aws.EnvAuth()
-	if err != nil {
-		c.Fatal(err)
-	}
-	s.auth = auth
-}
-
-type HTTPSuite struct{}
-
-var testServer = NewTestHTTPServer("http://localhost:4444", 5*time.Second)
-
-func (s *HTTPSuite) SetUpSuite(c *gocheck.C) {
-	testServer.Start()
-}
-
-func (s *HTTPSuite) TearDownTest(c *gocheck.C) {
-	testServer.FlushRequests()
-}
-
-type TestHTTPServer struct {
-	URL      string
-	Timeout  time.Duration
-	started  bool
-	request  chan *http.Request
-	response chan *testResponse
-	pending  chan bool
-}
-
-type testResponse struct {
-	Status  int
-	Headers map[string]string
-	Body    string
-}
-
-func NewTestHTTPServer(url_ string, timeout time.Duration) *TestHTTPServer {
-	return &TestHTTPServer{URL: url_, Timeout: timeout}
-}
-
-func (s *TestHTTPServer) Start() {
-	if s.started {
-		return
-	}
-	s.started = true
-
-	s.request = make(chan *http.Request, 64)
-	s.response = make(chan *testResponse, 64)
-	s.pending = make(chan bool, 64)
-
-	url_, _ := url.Parse(s.URL)
-	go http.ListenAndServe(url_.Host, s)
-
-	s.PrepareResponse(202, nil, "Nothing.")
-	for {
-		// Wait for it to be up.
-		resp, err := http.Get(s.URL)
-		if err == nil && resp.StatusCode == 202 {
-			break
-		}
-		fmt.Fprintf(os.Stderr, "\nWaiting for fake server to be up... ")
-		time.Sleep(1e8)
-	}
-	fmt.Fprintf(os.Stderr, "done\n\n")
-	s.WaitRequest() // Consume dummy request.
-}
-
-// FlushRequests discards requests which were not yet consumed by WaitRequest.
-func (s *TestHTTPServer) FlushRequests() {
-	for {
-		select {
-		case <-s.request:
-		default:
-			return
-		}
-	}
-}
-
-func (s *TestHTTPServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	s.request <- req
-	var resp *testResponse
-	select {
-	case resp = <-s.response:
-	case <-time.After(s.Timeout):
-		fmt.Fprintf(os.Stderr, "ERROR: Timeout waiting for test to provide response\n")
-		resp = &testResponse{500, nil, ""}
-	}
-	if resp.Headers != nil {
-		h := w.Header()
-		for k, v := range resp.Headers {
-			h.Set(k, v)
-		}
-	}
-	if resp.Status != 0 {
-		w.WriteHeader(resp.Status)
-	}
-	w.Write([]byte(resp.Body))
-}
-
-func (s *TestHTTPServer) WaitRequest() *http.Request {
-	select {
-	case req := <-s.request:
-		req.ParseForm()
-		return req
-	case <-time.After(s.Timeout):
-		panic("Timeout waiting for goamz request")
-	}
-	panic("unreached")
-}
-
-func (s *TestHTTPServer) PrepareResponse(status int, headers map[string]string, body string) {
-	s.response <- &testResponse{status, headers, body}
-}
 
=== modified file 'exp/sns/sns_test.go'
--- exp/sns/sns_test.go	2012-05-03 17:12:28 +0000
+++ exp/sns/sns_test.go	2013-01-31 17:09:20 +0000
@@ -3,22 +3,33 @@
 import (
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/exp/sns"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
+	"testing"
 )
 
+func Test(t *testing.T) {
+	TestingT(t)
+}
+
 var _ = Suite(&S{})
 
 type S struct {
-	HTTPSuite
 	sns *sns.SNS
 }
 
+var testServer = testutil.NewHTTPServer()
+
 func (s *S) SetUpSuite(c *C) {
-	s.HTTPSuite.SetUpSuite(c)
+	testServer.Start()
 	auth := aws.Auth{"abc", "123"}
 	s.sns = sns.New(auth, aws.Region{SNSEndpoint: testServer.URL})
 }
 
+func (s *S) TearDownTest(c *C) {
+	testServer.Flush()
+}
+
 func (s *S) TestListTopicsOK(c *C) {
 	testServer.Response(200, nil, TestListTopicsXmlOK)
 
 
=== removed file 'exp/sns/suite_test.go'
--- exp/sns/suite_test.go	2012-03-09 15:34:56 +0000
+++ exp/sns/suite_test.go	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-package sns_test
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	. "launchpad.net/gocheck"
-	"net/http"
-	"net/url"
-	"os"
-	"testing"
-	"time"
-)
-
-func Test(t *testing.T) {
-	TestingT(t)
-}
-
-var integration = flag.Bool("i", false, "Enable integration tests")
-
-type SuiteI struct{}
-
-func (s *SuiteI) SetUpSuite(c *C) {
-	if !*integration {
-		c.Skip("Integration tests not enabled (-i flag)")
-	}
-}
-
-type HTTPSuite struct{}
-
-var testServer = NewTestHTTPServer("http://localhost:4444", 5*time.Second)
-
-func (s *HTTPSuite) SetUpSuite(c *C) {
-	testServer.Start()
-}
-
-func (s *HTTPSuite) TearDownTest(c *C) {
-	testServer.Flush()
-}
-
-type TestHTTPServer struct {
-	URL      string
-	Timeout  time.Duration
-	started  bool
-	request  chan *http.Request
-	response chan ResponseFunc
-	pending  chan bool
-}
-
-func NewTestHTTPServer(url_ string, timeout time.Duration) *TestHTTPServer {
-	return &TestHTTPServer{URL: url_, Timeout: timeout}
-}
-
-type Response struct {
-	Status  int
-	Headers map[string]string
-	Body    string
-}
-
-type ResponseFunc func(path string) Response
-
-func (s *TestHTTPServer) Start() {
-	if s.started {
-		return
-	}
-	s.started = true
-
-	s.request = make(chan *http.Request, 64)
-	s.response = make(chan ResponseFunc, 64)
-	s.pending = make(chan bool, 64)
-
-	url_, _ := url.Parse(s.URL)
-	go http.ListenAndServe(url_.Host, s)
-
-	s.Response(203, nil, "")
-	for {
-		// Wait for it to be up.
-		resp, err := http.Get(s.URL)
-		if err == nil && resp.StatusCode == 203 {
-			break
-		}
-		fmt.Fprintf(os.Stderr, "\nWaiting for fake server to be up... ")
-		time.Sleep(1e8)
-	}
-	fmt.Fprintf(os.Stderr, "done\n\n")
-	s.WaitRequest() // Consume dummy request.
-}
-
-// FlushRequests discards requests which were not yet consumed by WaitRequest.
-func (s *TestHTTPServer) Flush() {
-	for {
-		select {
-		case <-s.request:
-		case <-s.response:
-		default:
-			return
-		}
-	}
-}
-
-func body(req *http.Request) string {
-	data, err := ioutil.ReadAll(req.Body)
-	if err != nil {
-		panic(err)
-	}
-	return string(data)
-}
-
-func (s *TestHTTPServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	req.ParseMultipartForm(1e6)
-	data, err := ioutil.ReadAll(req.Body)
-	if err != nil {
-		panic(err)
-	}
-	req.Body = ioutil.NopCloser(bytes.NewBuffer(data))
-	s.request <- req
-	var resp Response
-	select {
-	case respFunc := <-s.response:
-		resp = respFunc(req.URL.Path)
-	case <-time.After(s.Timeout):
-		const msg = "ERROR: Timeout waiting for test to prepare a response\n"
-		fmt.Fprintf(os.Stderr, msg)
-		resp = Response{500, nil, msg}
-	}
-	if resp.Headers != nil {
-		h := w.Header()
-		for k, v := range resp.Headers {
-			h.Set(k, v)
-		}
-	}
-	if resp.Status != 0 {
-		w.WriteHeader(resp.Status)
-	}
-	w.Write([]byte(resp.Body))
-}
-
-// WaitRequests returns the next n requests made to the http server from
-// the queue. If not enough requests were previously made, it waits until
-// the timeout value for them to be made.
-func (s *TestHTTPServer) WaitRequests(n int) []*http.Request {
-	reqs := make([]*http.Request, 0, n)
-	for i := 0; i < n; i++ {
-		select {
-		case req := <-s.request:
-			reqs = append(reqs, req)
-		case <-time.After(s.Timeout):
-			panic("Timeout waiting for request")
-		}
-	}
-	return reqs
-}
-
-// WaitRequest returns the next request made to the http server from
-// the queue. If no requests were previously made, it waits until the
-// timeout value for one to be made.
-func (s *TestHTTPServer) WaitRequest() *http.Request {
-	return s.WaitRequests(1)[0]
-}
-
-// ResponseFunc prepares the test server to respond the following n
-// requests using f to build each response.
-func (s *TestHTTPServer) ResponseFunc(n int, f ResponseFunc) {
-	for i := 0; i < n; i++ {
-		s.response <- f
-	}
-}
-
-// ResponseMap maps request paths to responses.
-type ResponseMap map[string]Response
-
-// ResponseMap prepares the test server to respond the following n
-// requests using the m to obtain the responses.
-func (s *TestHTTPServer) ResponseMap(n int, m ResponseMap) {
-	f := func(path string) Response {
-		for rpath, resp := range m {
-			if rpath == path {
-				return resp
-			}
-		}
-		return Response{Status: 500, Body: "Path not found in response map: " + path}
-	}
-	s.ResponseFunc(n, f)
-}
-
-// Responses prepares the test server to respond the following n requests
-// using the provided response parameters.
-func (s *TestHTTPServer) Responses(n int, status int, headers map[string]string, body string) {
-	f := func(path string) Response {
-		return Response{status, headers, body}
-	}
-	s.ResponseFunc(n, f)
-}
-
-// Response prepares the test server to respond the following request
-// using the provided response parameters.
-func (s *TestHTTPServer) Response(status int, headers map[string]string, body string) {
-	s.Responses(1, status, headers, body)
-}
 
=== modified file 'iam/iam_test.go'
--- iam/iam_test.go	2012-10-10 20:16:54 +0000
+++ iam/iam_test.go	2013-01-31 17:09:20 +0000
@@ -3,24 +3,35 @@
 import (
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/iam"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
+	"testing"
 )
 
+func Test(t *testing.T) {
+	TestingT(t)
+}
+
 type S struct {
-	HTTPSuite
 	iam *iam.IAM
 }
 
 var _ = Suite(&S{})
 
+var testServer = testutil.NewHTTPServer()
+
 func (s *S) SetUpSuite(c *C) {
-	s.HTTPSuite.SetUpSuite(c)
+	testServer.Start()
 	auth := aws.Auth{"abc", "123"}
 	s.iam = iam.New(auth, aws.Region{IAMEndpoint: testServer.URL})
 }
 
+func (s *S) TearDownTest(c *C) {
+	testServer.Flush()
+}
+
 func (s *S) TestCreateUser(c *C) {
-	testServer.PrepareResponse(200, nil, CreateUserExample)
+	testServer.Response(200, nil, CreateUserExample)
 	resp, err := s.iam.CreateUser("Bob", "/division_abc/subdivision_xyz/")
 	values := testServer.WaitRequest().URL.Query()
 	c.Assert(values.Get("Action"), Equals, "CreateUser")
@@ -38,7 +49,7 @@
 }
 
 func (s *S) TestCreateUserConflict(c *C) {
-	testServer.PrepareResponse(409, nil, DuplicateUserExample)
+	testServer.Response(409, nil, DuplicateUserExample)
 	resp, err := s.iam.CreateUser("Bob", "/division_abc/subdivision_xyz/")
 	testServer.WaitRequest()
 	c.Assert(resp, IsNil)
@@ -50,7 +61,7 @@
 }
 
 func (s *S) TestGetUser(c *C) {
-	testServer.PrepareResponse(200, nil, GetUserExample)
+	testServer.Response(200, nil, GetUserExample)
 	resp, err := s.iam.GetUser("Bob")
 	values := testServer.WaitRequest().URL.Query()
 	c.Assert(values.Get("Action"), Equals, "GetUser")
@@ -67,7 +78,7 @@
 }
 
 func (s *S) TestDeleteUser(c *C) {
-	testServer.PrepareResponse(200, nil, RequestIdExample)
+	testServer.Response(200, nil, RequestIdExample)
 	resp, err := s.iam.DeleteUser("Bob")
 	values := testServer.WaitRequest().URL.Query()
 	c.Assert(values.Get("Action"), Equals, "DeleteUser")
@@ -77,7 +88,7 @@
 }
 
 func (s *S) TestCreateAccessKey(c *C) {
-	testServer.PrepareResponse(200, nil, CreateAccessKeyExample)
+	testServer.Response(200, nil, CreateAccessKeyExample)
 	resp, err := s.iam.CreateAccessKey("Bob")
 	values := testServer.WaitRequest().URL.Query()
 	c.Assert(values.Get("Action"), Equals, "CreateAccessKey")
 
=== modified file 'iam/iami_test.go'
--- iam/iami_test.go	2012-10-10 20:21:55 +0000
+++ iam/iami_test.go	2013-01-31 17:09:20 +0000
@@ -1,14 +1,12 @@
 package iam_test
 
 import (
-	"flag"
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/iam"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
 )
 
-var amazon = flag.Bool("amazon", false, "Enable tests against amazon server")
-
 // AmazonServer represents an Amazon AWS server.
 type AmazonServer struct {
 	auth aws.Auth
@@ -31,7 +29,7 @@
 }
 
 func (s *AmazonClientSuite) SetUpSuite(c *C) {
-	if !*amazon {
+	if !testutil.Amazon {
 		c.Skip("AmazonClientSuite tests not enabled")
 	}
 	s.srv.SetUp(c)
 
=== removed file 'iam/suite_test.go'
--- iam/suite_test.go	2012-10-05 22:45:47 +0000
+++ iam/suite_test.go	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-package iam_test
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	. "launchpad.net/gocheck"
-	"net/http"
-	"net/url"
-	"os"
-	"testing"
-	"time"
-)
-
-func Test(t *testing.T) {
-	TestingT(t)
-}
-
-type HTTPSuite struct{}
-
-var testServer = NewTestHTTPServer("http://localhost:4444", 5*time.Second)
-
-func (s *HTTPSuite) SetUpSuite(c *C) {
-	testServer.Start()
-}
-
-func (s *HTTPSuite) TearDownTest(c *C) {
-	testServer.FlushRequests()
-}
-
-type TestHTTPServer struct {
-	URL      string
-	Timeout  time.Duration
-	started  bool
-	body     chan []byte
-	request  chan *http.Request
-	response chan *testResponse
-	pending  chan bool
-}
-
-type testResponse struct {
-	Status  int
-	Headers map[string]string
-	Body    string
-}
-
-func NewTestHTTPServer(url string, timeout time.Duration) *TestHTTPServer {
-	return &TestHTTPServer{URL: url, Timeout: timeout}
-}
-
-func (s *TestHTTPServer) Start() {
-	if s.started {
-		return
-	}
-	s.started = true
-
-	s.body = make(chan []byte, 64)
-	s.request = make(chan *http.Request, 64)
-	s.response = make(chan *testResponse, 64)
-	s.pending = make(chan bool, 64)
-
-	url, _ := url.Parse(s.URL)
-	go http.ListenAndServe(url.Host, s)
-
-	s.PrepareResponse(202, nil, "Nothing.")
-	for {
-		// Wait for it to be up.
-		resp, err := http.Get(s.URL)
-		if err == nil && resp.StatusCode == 202 {
-			break
-		}
-		fmt.Fprintf(os.Stderr, "\nWaiting for fake server to be up... ")
-		time.Sleep(1e8)
-	}
-	fmt.Fprintf(os.Stderr, "done\n\n")
-	s.WaitRequest() // Consume dummy request.
-}
-
-// FlushRequests discards requests which were not yet consumed by WaitRequest.
-func (s *TestHTTPServer) FlushRequests() {
-	for {
-		select {
-		case <-s.request:
-		default:
-			return
-		}
-	}
-}
-
-func (s *TestHTTPServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	b, _ := ioutil.ReadAll(req.Body)
-	s.body <- b
-	s.request <- req
-	var resp *testResponse
-	select {
-	case resp = <-s.response:
-	case <-time.After(s.Timeout):
-		fmt.Fprintf(os.Stderr, "ERROR: Timeout waiting for test to provide response\n")
-		resp = &testResponse{500, nil, ""}
-	}
-	if resp.Headers != nil {
-		h := w.Header()
-		for k, v := range resp.Headers {
-			h.Set(k, v)
-		}
-	}
-	if resp.Status != 0 {
-		w.WriteHeader(resp.Status)
-	}
-	w.Write([]byte(resp.Body))
-}
-
-func (s *TestHTTPServer) WaitRequest() *http.Request {
-	select {
-	case req := <-s.request:
-		body := <-s.body
-		req.Body = ioutil.NopCloser(bytes.NewReader(body))
-		req.ParseForm()
-		return req
-	case <-time.After(s.Timeout):
-		panic("Timeout waiting for goamz request")
-	}
-	panic("unreached")
-}
-
-func (s *TestHTTPServer) PrepareResponse(status int, headers map[string]string, body string) {
-	s.response <- &testResponse{status, headers, body}
-}
 
=== modified file 's3/s3.go'
--- s3/s3.go	2012-12-10 05:30:05 +0000
+++ s3/s3.go	2013-01-31 17:09:20 +0000
@@ -67,7 +67,7 @@
 // locationConstraint returns an io.Reader specifying a LocationConstraint if
 // required for the region.
 //
-// See http://goo.gl/bh9Kq for more details.
+// See http://goo.gl/bh9Kq for details.
 func (s3 *S3) locationConstraint() io.Reader {
 	constraint := ""
 	if s3.Region.S3LocationConstraint {
@@ -89,7 +89,7 @@
 
 // PutBucket creates a new bucket.
 //
-// See http://goo.gl/ndjnR for more details.
+// See http://goo.gl/ndjnR for details.
 func (b *Bucket) PutBucket(perm ACL) error {
 	headers := map[string][]string{
 		"x-amz-acl": {string(perm)},
@@ -107,7 +107,7 @@
 // DelBucket removes an existing S3 bucket. All objects in the bucket must
 // be removed before the bucket itself can be removed.
 //
-// See http://goo.gl/GoBrY for more details.
+// See http://goo.gl/GoBrY for details.
 func (b *Bucket) DelBucket() error {
 	req := &request{
 		method: "DELETE",
@@ -117,9 +117,14 @@
 	return b.S3.query(req, nil)
 }
 
+func hasCode(err error, code string) bool {
+	s3err, ok := err.(*Error)
+	return ok && s3err.Code == code
+}
+
 // Get retrieves an object from an S3 bucket.
 //
-// See http://goo.gl/isCO7 for more details.
+// See http://goo.gl/isCO7 for details.
 func (b *Bucket) Get(path string) (data []byte, err error) {
 	body, err := b.GetReader(path)
 	if err != nil {
@@ -151,7 +156,7 @@
 
 // Put inserts an object into the S3 bucket.
 //
-// See http://goo.gl/FEBPD for more details.
+// See http://goo.gl/FEBPD for details.
 func (b *Bucket) Put(path string, data []byte, contType string, perm ACL) error {
 	body := bytes.NewBuffer(data)
 	return b.PutReader(path, body, int64(len(data)), contType, perm)
@@ -177,7 +182,7 @@
 
 // Del removes an object from the S3 bucket.
 //
-// See http://goo.gl/APeTt for more details.
+// See http://goo.gl/APeTt for details.
 func (b *Bucket) Del(path string) error {
 	req := &request{
 		method: "DELETE",
@@ -215,15 +220,15 @@
 	Owner        Owner
 }
 
-// List returns a information about objects in an S3 bucket.
+// List returns information about objects in an S3 bucket.
 //
 // The prefix parameter limits the response to keys that begin with the
-// specified prefix. You can use prefixes to separate a bucket into different
-// groupings of keys (e.g. to get a feeling of folders).
+// specified prefix.
 //
-// The delimited parameter causes the response to group all of the keys that
-// share a common prefix up to the next delimiter to be grouped in a single
-// entry within the CommonPrefixes field.
+// The delim parameter causes the response to group all of the keys that
+// share a common prefix up to the next delimiter in a single entry within
+// the CommonPrefixes field. You can use delimiters to separate a bucket
+// into different groupings of keys, similar to how folders would work.
 //
 // The marker parameter specifies the key to start with when listing objects
 // in a bucket. Amazon S3 lists objects in alphabetical order and
@@ -270,7 +275,7 @@
 //         },
 //     }
 //
-// See http://goo.gl/YjQTc for more details.
+// See http://goo.gl/YjQTc for details.
 func (b *Bucket) List(prefix, delim, marker string, max int) (result *ListResp, err error) {
 	params := map[string][]string{
 		"prefix":    {prefix},
 
=== modified file 's3/s3_test.go'
--- s3/s3_test.go	2012-07-05 05:47:52 +0000
+++ s3/s3_test.go	2013-01-31 17:09:20 +0000
@@ -4,29 +4,40 @@
 	"bytes"
 	"io/ioutil"
 	"net/http"
+	"testing"
 
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/s3"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
 )
 
-var _ = Suite(&S{})
+func Test(t *testing.T) {
+	TestingT(t)
+}
 
 type S struct {
-	HTTPSuite
 	s3 *s3.S3
 }
 
+var _ = Suite(&S{})
+
+var testServer = testutil.NewHTTPServer()
+
 func (s *S) SetUpSuite(c *C) {
-	s.HTTPSuite.SetUpSuite(c)
+	testServer.Start()
 	auth := aws.Auth{"abc", "123"}
 	s.s3 = s3.New(auth, aws.Region{Name: "faux-region-1", S3Endpoint: testServer.URL})
 }
 
+func (s *S) TearDownTest(c *C) {
+	testServer.Flush()
+}
+
 // PutBucket docs: http://goo.gl/kBTCu
 
 func (s *S) TestPutBucket(c *C) {
-	testServer.PrepareResponse(200, nil, "")
+	testServer.Response(200, nil, "")
 
 	b := s.s3.Bucket("bucket")
 	err := b.PutBucket(s3.Private)
@@ -41,7 +52,7 @@
 // DeleteBucket docs: http://goo.gl/GoBrY
 
 func (s *S) TestDelBucket(c *C) {
-	testServer.PrepareResponse(204, nil, "")
+	testServer.Response(204, nil, "")
 
 	b := s.s3.Bucket("bucket")
 	err := b.DelBucket()
@@ -56,7 +67,7 @@
 // GetObject docs: http://goo.gl/isCO7
 
 func (s *S) TestGet(c *C) {
-	testServer.PrepareResponse(200, nil, "content")
+	testServer.Response(200, nil, "content")
 
 	b := s.s3.Bucket("bucket")
 	data, err := b.Get("name")
@@ -71,7 +82,7 @@
 }
 
 func (s *S) TestURL(c *C) {
-	testServer.PrepareResponse(200, nil, "content")
+	testServer.Response(200, nil, "content")
 
 	b := s.s3.Bucket("bucket")
 	url := b.URL("name")
@@ -88,7 +99,7 @@
 }
 
 func (s *S) TestGetReader(c *C) {
-	testServer.PrepareResponse(200, nil, "content")
+	testServer.Response(200, nil, "content")
 
 	b := s.s3.Bucket("bucket")
 	rc, err := b.GetReader("name")
@@ -105,7 +116,7 @@
 }
 
 func (s *S) TestGetNotFound(c *C) {
-	testServer.PrepareResponse(404, nil, GetObjectErrorDump)
+	testServer.Response(404, nil, GetObjectErrorDump)
 
 	b := s.s3.Bucket("non-existent-bucket")
 	data, err := b.Get("non-existent")
@@ -130,7 +141,7 @@
 // PutObject docs: http://goo.gl/FEBPD
 
 func (s *S) TestPutObject(c *C) {
-	testServer.PrepareResponse(200, nil, "")
+	testServer.Response(200, nil, "")
 
 	b := s.s3.Bucket("bucket")
 	err := b.Put("name", []byte("content"), "content-type", s3.Private)
@@ -147,7 +158,7 @@
 }
 
 func (s *S) TestPutReader(c *C) {
-	testServer.PrepareResponse(200, nil, "")
+	testServer.Response(200, nil, "")
 
 	b := s.s3.Bucket("bucket")
 	buf := bytes.NewBufferString("content")
@@ -167,7 +178,7 @@
 // DelObject docs: http://goo.gl/APeTt
 
 func (s *S) TestDelObject(c *C) {
-	testServer.PrepareResponse(200, nil, "")
+	testServer.Response(200, nil, "")
 
 	b := s.s3.Bucket("bucket")
 	err := b.Del("name")
@@ -182,7 +193,7 @@
 // Bucket List Objects docs: http://goo.gl/YjQTc
 
 func (s *S) TestList(c *C) {
-	testServer.PrepareResponse(200, nil, GetListResultDump1)
+	testServer.Response(200, nil, GetListResultDump1)
 
 	b := s.s3.Bucket("quotes")
 
@@ -221,7 +232,7 @@
 }
 
 func (s *S) TestListWithDelimiter(c *C) {
-	testServer.PrepareResponse(200, nil, GetListResultDump2)
+	testServer.Response(200, nil, GetListResultDump2)
 
 	b := s.s3.Bucket("quotes")
 
 
=== modified file 's3/s3i_test.go'
--- s3/s3i_test.go	2013-01-28 13:30:10 +0000
+++ s3/s3i_test.go	2013-01-31 17:09:20 +0000
@@ -10,6 +10,7 @@
 
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/s3"
+	"launchpad.net/goamz/testutil"
 	. "launchpad.net/gocheck"
 	"time"
 )
@@ -45,7 +46,7 @@
 }
 
 func (s *AmazonClientSuite) SetUpSuite(c *C) {
-	if !*amazon {
+	if !testutil.Amazon {
 		c.Skip("live tests against AWS disabled (no -amazon)")
 	}
 	s.srv.SetUp(c)
@@ -62,7 +63,7 @@
 }
 
 func (s *AmazonDomainClientSuite) SetUpSuite(c *C) {
-	if !*amazon {
+	if !testutil.Amazon {
 		c.Skip("live tests against AWS disabled (no -amazon)")
 	}
 	s.srv.SetUp(c)
@@ -102,12 +103,15 @@
 
 func (s *ClientTests) TestBasicFunctionality(c *C) {
 	b := s.Bucket(testBucket)
+	b.DelBucket()
+
 	err := b.PutBucket(s3.PublicRead)
 	c.Assert(err, IsNil)
 	defer b.DelBucket()
 
 	err = b.Put("name", []byte("yo!"), "text/plain", s3.PublicRead)
 	c.Assert(err, IsNil)
+	defer b.Del("name")
 
 	data, err := b.Get("name")
 	c.Assert(err, IsNil)
@@ -120,6 +124,7 @@
 	buf := bytes.NewBufferString("hey!")
 	err = b.PutReader("name2", buf, int64(buf.Len()), "text/plain", s3.Private)
 	c.Assert(err, IsNil)
+	defer b.Del("name2")
 
 	rc, err := b.GetReader("name2")
 	c.Assert(err, IsNil)
@@ -225,16 +230,13 @@
 	// normal list.
 	{
 		Contents: keys(objectNames...),
-	},
-	{
+	}, {
 		Marker:   objectNames[0],
 		Contents: keys(objectNames[1:]...),
-	},
-	{
+	}, {
 		Marker:   objectNames[0] + "a",
 		Contents: keys(objectNames[1:]...),
-	},
-	{
+	}, {
 		Marker: "z",
 	},
 
@@ -243,14 +245,12 @@
 		MaxKeys:     2,
 		Contents:    keys(objectNames[0:2]...),
 		IsTruncated: true,
-	},
-	{
+	}, {
 		MaxKeys:     2,
 		Marker:      objectNames[0],
 		Contents:    keys(objectNames[1:3]...),
 		IsTruncated: true,
-	},
-	{
+	}, {
 		MaxKeys:  2,
 		Marker:   objectNames[len(objectNames)-2],
 		Contents: keys(objectNames[len(objectNames)-1:]...),
@@ -261,38 +261,32 @@
 		Delimiter:      "/",
 		CommonPrefixes: []string{"photos/", "test/"},
 		Contents:       keys("index.html", "index2.html"),
-	},
-	{
+	}, {
 		Delimiter:      "/",
 		Prefix:         "photos/2006/",
 		CommonPrefixes: []string{"photos/2006/February/", "photos/2006/January/"},
-	},
-	{
+	}, {
 		Delimiter:      "/",
 		Prefix:         "t",
 		CommonPrefixes: []string{"test/"},
-	},
-	{
+	}, {
 		Delimiter:   "/",
 		MaxKeys:     1,
 		Contents:    keys("index.html"),
 		IsTruncated: true,
-	},
-	{
+	}, {
 		Delimiter:      "/",
 		MaxKeys:        1,
 		Marker:         "index2.html",
 		CommonPrefixes: []string{"photos/"},
 		IsTruncated:    true,
-	},
-	{
+	}, {
 		Delimiter:      "/",
 		MaxKeys:        1,
 		Marker:         "photos/",
 		CommonPrefixes: []string{"test/"},
 		IsTruncated:    false,
-	},
-	{
+	}, {
 		Delimiter:      "Feb",
 		CommonPrefixes: []string{"photos/2006/Feb"},
 		Contents:       keys("index.html", "index2.html", "photos/2006/January/sample.jpg", "test/bar", "test/foo"),
 
=== removed file 's3/suite_test.go'
--- s3/suite_test.go	2012-05-02 15:22:53 +0000
+++ s3/suite_test.go	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-package s3_test
-
-import (
-	"flag"
-	"fmt"
-	"launchpad.net/goamz/aws"
-	. "launchpad.net/gocheck"
-	"net/http"
-	"net/url"
-	"os"
-	"testing"
-	"time"
-)
-
-func Test(t *testing.T) {
-	TestingT(t)
-}
-
-var amazon = flag.Bool("amazon", false, "Enable tests against amazon server")
-
-type SuiteI struct {
-	auth aws.Auth
-}
-
-func (s *SuiteI) SetUpSuite(c *C) {
-	if !*amazon {
-		c.Skip("amazon tests not enabled (-amazon flag)")
-	}
-	auth, err := aws.EnvAuth()
-	if err != nil {
-		c.Fatal(err.Error())
-	}
-	s.auth = auth
-}
-
-type HTTPSuite struct{}
-
-var testServer = NewTestHTTPServer("http://localhost:4444", 5*time.Second)
-
-func (s *HTTPSuite) SetUpSuite(c *C) {
-	testServer.Start()
-}
-
-func (s *HTTPSuite) TearDownTest(c *C) {
-	testServer.FlushRequests()
-}
-
-type TestHTTPServer struct {
-	URL      string
-	Timeout  time.Duration
-	started  bool
-	request  chan *http.Request
-	response chan *testResponse
-	pending  chan bool
-}
-
-type testResponse struct {
-	Status  int
-	Headers map[string]string
-	Body    string
-}
-
-func NewTestHTTPServer(url string, timeout time.Duration) *TestHTTPServer {
-	return &TestHTTPServer{URL: url, Timeout: timeout}
-}
-
-func (s *TestHTTPServer) Start() {
-	if s.started {
-		return
-	}
-	s.started = true
-
-	s.request = make(chan *http.Request, 64)
-	s.response = make(chan *testResponse, 64)
-	s.pending = make(chan bool, 64)
-
-	url, _ := url.Parse(s.URL)
-	go http.ListenAndServe(url.Host, s)
-
-	s.PrepareResponse(202, nil, "Nothing.")
-	for {
-		// Wait for it to be up.
-		resp, err := http.Get(s.URL)
-		if err == nil && resp.StatusCode == 202 {
-			break
-		}
-		fmt.Fprintf(os.Stderr, "\nWaiting for fake server to be up... ")
-		time.Sleep(1e8)
-	}
-	fmt.Fprintf(os.Stderr, "done\n\n")
-	s.WaitRequest() // Consume dummy request.
-}
-
-// FlushRequests discards requests which were not yet consumed by WaitRequest.
-func (s *TestHTTPServer) FlushRequests() {
-	for {
-		select {
-		case <-s.request:
-		default:
-			return
-		}
-	}
-}
-
-func (s *TestHTTPServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	s.request <- req
-	var resp *testResponse
-	select {
-	case resp = <-s.response:
-	case <-time.After(s.Timeout):
-		fmt.Fprintf(os.Stderr, "ERROR: Timeout waiting for test to provide response\n")
-		resp = &testResponse{500, nil, ""}
-	}
-	if resp.Headers != nil {
-		h := w.Header()
-		for k, v := range resp.Headers {
-			h.Set(k, v)
-		}
-	}
-	if resp.Status != 0 {
-		w.WriteHeader(resp.Status)
-	}
-	w.Write([]byte(resp.Body))
-}
-
-func (s *TestHTTPServer) WaitRequest() *http.Request {
-	select {
-	case req := <-s.request:
-		req.ParseForm()
-		return req
-	case <-time.After(s.Timeout):
-		panic("Timeout waiting for goamz request")
-	}
-	panic("unreached")
-}
-
-func (s *TestHTTPServer) PrepareResponse(status int, headers map[string]string, body string) {
-	s.response <- &testResponse{status, headers, body}
-}
 
=== added directory 'testutil'
=== added file 'testutil/http.go'
--- testutil/http.go	1970-01-01 00:00:00 +0000
+++ testutil/http.go	2013-01-31 17:09:20 +0000
@@ -0,0 +1,174 @@
+package testutil
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"time"
+)
+
+type HTTPServer struct {
+	URL      string
+	Timeout  time.Duration
+	started  bool
+	request  chan *http.Request
+	response chan ResponseFunc
+}
+
+type Response struct {
+	Status  int
+	Headers map[string]string
+	Body    string
+}
+
+func NewHTTPServer() *HTTPServer {
+	return &HTTPServer{URL: "http://localhost:4444", Timeout: 5 * time.Second}
+}
+
+type ResponseFunc func(path string) Response
+
+func (s *HTTPServer) Start() {
+	if s.started {
+		return
+	}
+	s.started = true
+	s.request = make(chan *http.Request, 64)
+	s.response = make(chan ResponseFunc, 64)
+	u, err := url.Parse(s.URL)
+	if err != nil {
+		panic(err)
+	}
+	l, err := net.Listen("tcp", u.Host)
+	if err != nil {
+		panic(err)
+	}
+	go http.Serve(l, s)
+
+	s.Response(203, nil, "")
+	for {
+		// Wait for it to be up.
+		resp, err := http.Get(s.URL)
+		if err == nil && resp.StatusCode == 203 {
+			break
+		}
+		time.Sleep(1e8)
+	}
+	s.WaitRequest() // Consume dummy request.
+}
+
+// Flush discards all pending requests and responses.
+func (s *HTTPServer) Flush() {
+	for {
+		select {
+		case <-s.request:
+		case <-s.response:
+		default:
+			return
+		}
+	}
+}
+
+func body(req *http.Request) string {
+	data, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		panic(err)
+	}
+	return string(data)
+}
+
+func (s *HTTPServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	req.ParseMultipartForm(1e6)
+	data, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		panic(err)
+	}
+	req.Body = ioutil.NopCloser(bytes.NewBuffer(data))
+	s.request <- req
+	var resp Response
+	select {
+	case respFunc := <-s.response:
+		resp = respFunc(req.URL.Path)
+	case <-time.After(s.Timeout):
+		const msg = "ERROR: Timeout waiting for test to prepare a response\n"
+		fmt.Fprintf(os.Stderr, msg)
+		resp = Response{500, nil, msg}
+	}
+	if resp.Headers != nil {
+		h := w.Header()
+		for k, v := range resp.Headers {
+			h.Set(k, v)
+		}
+	}
+	if resp.Status != 0 {
+		w.WriteHeader(resp.Status)
+	}
+	w.Write([]byte(resp.Body))
+}
+
+// WaitRequests returns the next n requests made to the http server from
+// the queue. If not enough requests were previously made, it waits until
+// the timeout value for them to be made.
+func (s *HTTPServer) WaitRequests(n int) []*http.Request {
+	reqs := make([]*http.Request, 0, n)
+	for i := 0; i < n; i++ {
+		select {
+		case req := <-s.request:
+			reqs = append(reqs, req)
+		case <-time.After(s.Timeout):
+			panic("Timeout waiting for request")
+		}
+	}
+	return reqs
+}
+
+// WaitRequest returns the next request made to the http server from
+// the queue. If no requests were previously made, it waits until the
+// timeout value for one to be made.
+func (s *HTTPServer) WaitRequest() *http.Request {
+	return s.WaitRequests(1)[0]
+}
+
+// ResponseFunc prepares the test server to respond the following n
+// requests using f to build each response.
+func (s *HTTPServer) ResponseFunc(n int, f ResponseFunc) {
+	for i := 0; i < n; i++ {
+		s.response <- f
+	}
+}
+
+// ResponseMap maps request paths to responses.
+type ResponseMap map[string]Response
+
+// ResponseMap prepares the test server to respond the following n
+// requests using the m to obtain the responses.
+func (s *HTTPServer) ResponseMap(n int, m ResponseMap) {
+	f := func(path string) Response {
+		for rpath, resp := range m {
+			if rpath == path {
+				return resp
+			}
+		}
+		body := "Path not found in response map: " + path
+		return Response{Status: 500, Body: body}
+	}
+	s.ResponseFunc(n, f)
+}
+
+// Responses prepares the test server to respond the following n requests
+// using the provided response parameters.
+func (s *HTTPServer) Responses(n int, status int, headers map[string]string, body string) {
+	f := func(path string) Response {
+		return Response{status, headers, body}
+	}
+	s.ResponseFunc(n, f)
+}
+
+// Response prepares the test server to respond the following request
+// using the provided response parameters.
+func (s *HTTPServer) Response(status int, headers map[string]string, body string) {
+	s.Responses(1, status, headers, body)
+}
 
=== added file 'testutil/suite.go'
--- testutil/suite.go	1970-01-01 00:00:00 +0000
+++ testutil/suite.go	2013-01-31 17:09:20 +0000
@@ -0,0 +1,30 @@
+package testutil
+
+import (
+	"flag"
+	"launchpad.net/goamz/aws"
+	. "launchpad.net/gocheck"
+)
+
+// Amazon must be used by all tested packages to determine whether to
+// run functional tests against the real AWS servers.
+var Amazon bool
+
+func init() {
+	flag.BoolVar(&Amazon, "amazon", false, "Enable tests against amazon server")
+}
+
+type LiveSuite struct {
+	auth aws.Auth
+}
+
+func (s *LiveSuite) SetUpSuite(c *C) {
+	if !Amazon {
+		c.Skip("amazon tests not enabled (-amazon flag)")
+	}
+	auth, err := aws.EnvAuth()
+	if err != nil {
+		c.Fatal(err.Error())
+	}
+	s.auth = auth
+}