Fix UploadPythonPackagesTests

admin/aws.py

@@ -548,13 +548,18 @@ def _perform_upload_s3_key(self, dispatcher, intent):
         """
         See :class:`UploadToS3`.
         """
-        bucket = self.s3_buckets[intent.target_bucket]
+
         with intent.file.open() as source_file:
             content = source_file.read()
+        # XXX: Need to think about this.
+        # The fake currently only allows unicode content.
         content_type = intent.content_type
         if content_type is not None:
             content = ContentTypeUnicode(content, content_type)
-        bucket[intent.target_key] = content
+        self.state = self.state.transform(
+            ['s3_buckets', intent.target_bucket, intent.target_key],
+            content
+        )
 
     def get_dispatcher(self):
         """

admin/test/test_release.py

@@ -1185,15 +1185,18 @@ class UploadPythonPackagesTests(TestCase):
 
     def setUp(self):
         super(UploadPythonPackagesTests, self).setUp()
-        self.target_bucket = 'test-target-bucket'
+        self.target_bucket = u'test-target-bucket'
         self.scratch_directory = FilePath(self.mktemp())
         self.top_level = FilePath(self.mktemp())
         self.top_level.makedirs()
         self.aws = FakeAWS(
-            routing_rules={},
-            s3_buckets={
-                self.target_bucket: {},
-            })
+            state=FakeAWSState(
+                routing_rules=freeze({}),
+                s3_buckets=freeze({
+                    self.target_bucket: {},
+                })
+            )
+        )
 
     def upload_python_packages(self):
         """
@@ -1237,7 +1240,7 @@ def test_distributions_uploaded(self):
 
         self.upload_python_packages()
 
-        aws_keys = self.aws.s3_buckets[self.target_bucket].keys()
+        aws_keys = self.aws.state.s3_buckets[self.target_bucket].keys()
         self.assertEqual(
             sorted(aws_keys),
             ['python/Flocker-0.3.0-py2-none-any.whl',