Merge lp:~zooko/txaws/742947-skip-tests-relying-on-epsilon into lp:txaws

[Zooko Wilcox-O'Hearn]

See #742947

(Sorry, I haven't figured out the work-flow to submit patches on launchpad.)

[Jamu Kakar (jkakar)]

Zooko, thanks for the fix!

review: Approve

=== modified file 'txaws/s3/tests/test_client.py'
--- txaws/s3/tests/test_client.py	2009-11-23 00:55:44 +0000
+++ txaws/s3/tests/test_client.py	2011-03-26 05:44:27 +0000
@@ -1,7 +1,12 @@
 from twisted.internet.defer import succeed
 
 from txaws.credentials import AWSCredentials
-from txaws.s3 import client
+try:
+    from txaws.s3 import client
+except ImportError:
+    s3clientSkip = "S3Client couldn't be imported (perhaps because epsilon, on which it depends, isn't present)"
+else:
+    s3clientSkip = None
 from txaws.service import AWSServiceEndpoint
 from txaws.testing import payload
 from txaws.testing.base import TXAWSTestCase
@@ -54,6 +59,8 @@
             url_context.get_url(),
             "http://mydocs.localhost/notes.txt")
 
+URLContextTestCase.skip = s3clientSkip
+
 
 class BucketURLContextTestCase(TXAWSTestCase):
 
@@ -64,6 +71,7 @@
         self.assertEquals(url_context.get_host(), "s3.amazonaws.com")
         self.assertEquals(url_context.get_path(), "/mystuff")
 
+BucketURLContextTestCase.skip = s3clientSkip
 
 class S3ClientTestCase(TXAWSTestCase):
 
@@ -297,6 +305,7 @@
         s3 = client.S3Client(creds, query_factory=StubQuery)
         return s3.delete_object("mybucket", "objectname")
 
+S3ClientTestCase.skip = s3clientSkip
 
 class QueryTestCase(TXAWSTestCase):
 
@@ -469,6 +478,7 @@
             headers["Authorization"],
             "AWS fookeyid:TESTINGSIG=")
 
+QueryTestCase.skip = s3clientSkip
 
 class MiscellaneousTests(TXAWSTestCase):
 

=== modified file 'txaws/tests/test_service.py'
--- txaws/tests/test_service.py	2009-11-27 21:00:13 +0000
+++ txaws/tests/test_service.py	2011-03-26 05:44:27 +0000
@@ -3,7 +3,13 @@
 
 from txaws.credentials import AWSCredentials
 from txaws.ec2.client import EC2Client
-from txaws.s3.client import S3Client
+try:
+    from txaws.s3.client import S3Client
+except ImportError:
+    s3clientSkip = "S3Client couldn't be imported (perhaps because epsilon, on which it depends, isn't present)"
+else:
+    s3clientSkip = None
+
 from txaws.service import (AWSServiceEndpoint, AWSServiceRegion,
                            EC2_ENDPOINT_EU, EC2_ENDPOINT_US, REGION_EU)
 from txaws.testing.base import TXAWSTestCase
@@ -158,3 +164,4 @@
         self.assertEquals(original_client, None)
         self.assertTrue(isinstance(new_client, S3Client))
         self.assertNotEquals(original_client, new_client)
+    test_get_s3_client_with_empty_cache.skip = s3clientSkip