Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/skip-zip into lp:ubuntuone-client

  1. skip-zip
  2. Merge into trunk
Proposed by dobey on 2012-09-07
Status: Merged
Approved by: Roberto Alsina on 2012-09-07
Approved revision: 1306
Merged at revision: 1306
Proposed branch: lp:~dobey/ubuntuone-client/skip-zip
Merge into: lp:ubuntuone-client
Diff against target: 19 lines (+2/-0)
1 file modified
tests/syncdaemon/test_action_queue.py (+2/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/skip-zip
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve on 2012-09-07
Alejandro J. Cura (community) trivial 2012-09-07 Approve on 2012-09-07
Review via email: mp+123351@code.launchpad.net

Commit Message

Skip test_zip_acquire_lock as it fails intermittently with twisted 12.x

To post a comment you must log in.
Alejandro J. Cura (alecu) :
review: Approve (trivial)
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/syncdaemon/test_action_queue.py'
2--- tests/syncdaemon/test_action_queue.py 2012-06-14 13:47:02 +0000
3+++ tests/syncdaemon/test_action_queue.py 2012-09-07 19:37:22 +0000
4@@ -62,6 +62,7 @@
5 FakeUpload,
6 )
7 from ubuntuone.devtools import handlers
8+from ubuntuone.devtools.testcases import skipTest
9 from ubuntuone import logger, clientdefs
10 from ubuntuone.platform import open_file, platform, path_exists
11 from ubuntuone.storageprotocol import (
12@@ -1022,6 +1023,7 @@
13 yield self.zq.zip(upload, 'willbreak')
14 self.assertEqual(len(called), 0)
15
16+ @skipTest('Intermittently failing on twisted 12: LP: #1031815')
17 @defer.inlineCallbacks
18 def test_zip_acquire_lock(self):
19 """Test that it acquires the lock."""

Subscribers

People subscribed via source and target branches