Merge remote-tracking branch 'upstream/master'

aio-libs · Oct 27, 2014 · 6e04d1a · 6e04d1a
2 parents d7443d7 + e262e65
commit 6e04d1a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tests/test_client_functional.py b/tests/test_client_functional.py
@@ -586,8 +586,12 @@ def test_POST_FILES_SINGLE_BINARY(self):
                 f.seek(0)
                 self.assertEqual(0, len(content['multipart-data']))
                 self.assertEqual(content['content'], f.read().decode())
-                self.assertEqual(content['headers']['Content-Type'],
-                                 'application/pgp-keys')
+
+                # if system cannot determine 'application/pgp-keys' MIME type
+                # then use 'application/octet-stream' default
+                self.assertIn(content['headers']['Content-Type'],
+                              ('application/pgp-keys',
+                               'application/octet-stream'))
                 self.assertEqual(r.status, 200)
                 r.close()