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

Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
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
Roberto Alsina (community) Approve
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.
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/platform/test_tools.py'
--- tests/platform/test_tools.py 2012-03-28 21:14:55 +0000
+++ tests/platform/test_tools.py 2012-03-29 21:27:20 +0000
@@ -624,6 +624,12 @@
624 "UDF %s is subscribed" % udf.id)624 "UDF %s is subscribed" % udf.id)
625625
626 @defer.inlineCallbacks626 @defer.inlineCallbacks
627 def test_validate_path(self):
628 """Test for Folders.validate_path."""
629 result = yield self.tool.validate_path(self.root_dir)
630 self.assertFalse(result)
631
632 @defer.inlineCallbacks
627 def test_subscribe_share(self):633 def test_subscribe_share(self):
628 """Test for Shares.subscribe."""634 """Test for Shares.subscribe."""
629 share = self._create_share(accepted=True, subscribed=False)635 share = self._create_share(accepted=True, subscribed=False)
630636
=== modified file 'ubuntuone/platform/tools/__init__.py'
--- ubuntuone/platform/tools/__init__.py 2012-03-28 21:21:36 +0000
+++ ubuntuone/platform/tools/__init__.py 2012-03-29 21:27:20 +0000
@@ -1,9 +1,6 @@
1# -*- coding: utf-8 -*-1# -*- coding: utf-8 -*-
2#2#
3# Authors: Guillermo Gonzalez <guillermo.gonzalez@canonical.com>3# Copyright 2009-2012 Canonical Ltd.
4# Natalia B. Bidart <natalia.bidart@canonical.com>
5#
6# Copyright 2009-2011 Canonical Ltd.
7#4#
8# This program is free software: you can redistribute it and/or modify it5# This program is free software: you can redistribute it and/or modify it
9# under the terms of the GNU General Public License version 3, as published6# under the terms of the GNU General Public License version 3, as published
@@ -443,7 +440,7 @@
443 @log_call(logger.debug)440 @log_call(logger.debug)
444 def validate_path(self, path):441 def validate_path(self, path):
445 """Return True if the path is valid for a folder."""442 """Return True if the path is valid for a folder."""
446 result = yield self.proxy.call_method('folders', 'validate', path)443 result = yield self.proxy.call_method('folders', 'validate_path', path)
447 self.log.debug('valid: %r', result)444 self.log.debug('valid: %r', result)
448 defer.returnValue(result)445 defer.returnValue(result)
449446

Subscribers

People subscribed via source and target branches