OpenStack Object Storage (swift)

Merge lp://staging/~cthier/swift/skipswift3tests into lp://staging/~hudson-openstack/swift/trunk

  1. skipswift3tests
  2. Merge into trunk
Proposed by Chuck Thier
Status: Merged
Approved by: gholt
Approved revision: 231
Merged at revision: 230
Proposed branch: lp://staging/~cthier/swift/skipswift3tests
Merge into: lp://staging/~hudson-openstack/swift/trunk
Diff against target: 0 lines
To merge this branch: bzr merge lp://staging/~cthier/swift/skipswift3tests
Reviewer Review Type Date Requested Status
gholt (community) Approve
Review via email: mp+52132@code.staging.launchpad.net

Description of the change

Skip the swift3 middleware tests if boto is not installed (since it is an optional component)

To post a comment you must log in.
Revision history for this message
gholt (gholt) wrote :

=== modified file 'test/unit/common/middleware/test_swift3.py'
--- test/unit/common/middleware/test_swift3.py 2011-03-03 20:34:48 +0000
+++ test/unit/common/middleware/test_swift3.py 2011-03-03 20:44:04 +0000
@@ -24,11 +24,11 @@
 import simplejson
 from nose.plugins.skip import SkipTest

-from swift.common.middleware import swift3

 try:
     import boto.s3
     skip = False
+ from swift.common.middleware import swift3
 except Exception:
     # Skip the swift3 tests if boto is not installed
     skip = True

lp://staging/~cthier/swift/skipswift3tests updated
231. By Chuck Thier

heh

Revision history for this message
gholt (gholt) :
review: Approve

Preview Diff

Empty