Merging in latest boto.

tests/s3/test_connection.py

Index: tests/s3/test_connection.py
diff --git a/boto/tests/test_s3connection.py b/tests/s3/test_connection.py
similarity index 96%
rename from boto/tests/test_s3connection.py
rename to tests/s3/test_connection.py
index 3dd936f3fdb7c2172e7c724e6c6438e1da06a7a6..4c209bdd489d0d48935cbee4da19d5f00e8d676a 100644
--- a/boto/tests/test_s3connection.py
+++ b/tests/s3/test_connection.py
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
+# Copyright (c) 2006-2011 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -68,6 +67,9 @@ class S3ConnectionTest (unittest.TestCase):
         url = k.generate_url(3600, force_http=True)
         file = urllib.urlopen(url)
         assert s1 == file.read(), 'invalid URL %s' % url
+        url = k.generate_url(3600, force_http=True, headers={'x-amz-x-token' : 'XYZ'})
+        file = urllib.urlopen(url)
+        assert s1 == file.read(), 'invalid URL %s' % url
         bucket.delete_key(k)
         # test a few variations on get_all_keys - first load some data
         # for the first one, let's override the content type