Ubuntu One Client

Merge lp://qastaging/~facundo/ubuntuone-client/lr-enter-in-server-dirs into lp://qastaging/ubuntuone-client

  1. lr-enter-in-server-dirs
  2. Merge into trunk
Proposed by Facundo Batista
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 10
Merged at revision: not available
Proposed branch: lp://qastaging/~facundo/ubuntuone-client/lr-enter-in-server-dirs
Merge into: lp://qastaging/ubuntuone-client
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~facundo/ubuntuone-client/lr-enter-in-server-dirs
Reviewer Review Type Date Requested Status
Guillermo Gonzalez Approve
Rick McBride (community) Approve
Review via email: mp+6550@code.qastaging.launchpad.net

Commit message

[r=verterok, r=rmcbride] Now LR enters in directories that found in SERVER state.

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

Now LR enters in directories that found in SERVER state.

Revision history for this message
Rick McBride (rmcbride) wrote :

Nice!

review: Approve
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

looks good

review: Approve
lp://qastaging/~facundo/ubuntuone-client/lr-enter-in-server-dirs updated
11. By Facundo Batista

Merged the trunk in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'canonical/ubuntuone/storage/syncdaemon/local_rescan.py'
2--- canonical/ubuntuone/storage/syncdaemon/local_rescan.py 2009-05-12 13:36:05 +0000
3+++ canonical/ubuntuone/storage/syncdaemon/local_rescan.py 2009-05-13 19:43:31 +0000
4@@ -206,6 +206,7 @@
5 self.fsm.set_by_mdid(mdobj.mdid,
6 server_hash=mdobj.local_hash)
7 self.fsm.remove_partial(mdobj.node_id, mdobj.share_id)
8+ to_scan_later.append(fullname)
9 elif changed == "NONE":
10 # it's old, we should scan it later
11 log_debug("comp yield: dir %r will be scaned later!",
12
13=== modified file 'po/ubuntuone-client.pot'
14--- po/ubuntuone-client.pot 2009-05-13 14:21:08 +0000
15+++ po/ubuntuone-client.pot 2009-05-13 19:43:31 +0000
16@@ -8,7 +8,7 @@
17 msgstr ""
18 "Project-Id-Version: PACKAGE VERSION\n"
19 "Report-Msgid-Bugs-To: \n"
20-"POT-Creation-Date: 2009-05-13 16:20+0200\n"
21+"POT-Creation-Date: 2009-05-13 16:30-0300\n"
22 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
23 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
24 "Language-Team: LANGUAGE <LL@li.org>\n"
25
26=== modified file 'tests/syncdaemon/test_localrescan.py'
27--- tests/syncdaemon/test_localrescan.py 2009-05-12 17:34:36 +0000
28+++ tests/syncdaemon/test_localrescan.py 2009-05-13 19:43:31 +0000
29@@ -1095,12 +1095,17 @@
30 fh.write("foobar")
31 self.assertTrue(os.path.exists(os.path.join(path, ".partial")))
32
33+ # also put a file inside the directory, to check that LR enters in it
34+ filepath = os.path.join(path, "file")
35+ open(filepath, "w").close()
36+
37 def check(_):
38 '''arrange the metadata so later server_rescan will do ok'''
39 mdobj = self.fsm.get_by_mdid(mdid)
40 self.assertFalse(mdobj.info.is_partial)
41 self.assertEqual(mdobj.server_hash, mdobj.local_hash)
42 self.assertFalse(os.path.exists(path + ".partial"))
43+ self.assertEqual(self.eq.pushed, [('FS_FILE_CREATE', filepath)])
44
45 self.startTest(check)
46 return self.deferred

Subscribers

People subscribed via source and target branches