Ubuntu One Client

Merge lp:~nataliabidart/ubuntuone-client/valid-typo into lp:ubuntuone-client

  1. valid-typo
  2. Merge into trunk
Proposed by Natalia Bidart on 2012-03-29
Status: Merged
Approved by: Natalia Bidart on 2012-03-29
Approved revision: 1221
Merged at revision: 1220
Proposed branch: lp:~nataliabidart/ubuntuone-client/valid-typo
Merge into: lp:ubuntuone-client
Diff against target: 39 lines (+8/-5)
2 files modified
tests/platform/test_tools.py (+6/-0)
ubuntuone/platform/tools/__init__.py (+2/-5)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-client/valid-typo
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve on 2012-03-29
Roberto Alsina (community) 2012-03-29 Approve on 2012-03-29
Review via email: mp+100039@code.launchpad.net

Commit Message

- Fixed typo and added a missing test for validate_path in SyncDaemonTool (LP: #968637).

To post a comment you must log in.
Roberto Alsina (ralsina) wrote :

+1

review: Approve
Brian Curtin (brian.curtin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/platform/test_tools.py'
2--- tests/platform/test_tools.py 2012-03-28 21:14:55 +0000
3+++ tests/platform/test_tools.py 2012-03-29 21:27:20 +0000
4@@ -624,6 +624,12 @@
5 "UDF %s is subscribed" % udf.id)
6
7 @defer.inlineCallbacks
8+ def test_validate_path(self):
9+ """Test for Folders.validate_path."""
10+ result = yield self.tool.validate_path(self.root_dir)
11+ self.assertFalse(result)
12+
13+ @defer.inlineCallbacks
14 def test_subscribe_share(self):
15 """Test for Shares.subscribe."""
16 share = self._create_share(accepted=True, subscribed=False)
17
18=== modified file 'ubuntuone/platform/tools/__init__.py'
19--- ubuntuone/platform/tools/__init__.py 2012-03-28 21:21:36 +0000
20+++ ubuntuone/platform/tools/__init__.py 2012-03-29 21:27:20 +0000
21@@ -1,9 +1,6 @@
22 # -*- coding: utf-8 -*-
23 #
24-# Authors: Guillermo Gonzalez <guillermo.gonzalez@canonical.com>
25-# Natalia B. Bidart <natalia.bidart@canonical.com>
26-#
27-# Copyright 2009-2011 Canonical Ltd.
28+# Copyright 2009-2012 Canonical Ltd.
29 #
30 # This program is free software: you can redistribute it and/or modify it
31 # under the terms of the GNU General Public License version 3, as published
32@@ -443,7 +440,7 @@
33 @log_call(logger.debug)
34 def validate_path(self, path):
35 """Return True if the path is valid for a folder."""
36- result = yield self.proxy.call_method('folders', 'validate', path)
37+ result = yield self.proxy.call_method('folders', 'validate_path', path)
38 self.log.debug('valid: %r', result)
39 defer.returnValue(result)
40

Subscribers

People subscribed via source and target branches