Merge lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-syncc into lp://qastaging/ubuntuone-client

Proposed by Diego Sarmentero
Status: Merged
Approved by: Diego Sarmentero
Approved revision: 1360
Merged at revision: 1316
Proposed branch: lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-syncc
Merge into: lp://qastaging/ubuntuone-client
Diff against target: 768 lines (+686/-2)
8 files modified
po/POTFILES.in (+1/-0)
tests/platform/sync_menu/__init__.py (+27/-0)
tests/platform/sync_menu/test_linux.py (+316/-0)
tests/syncdaemon/test_main.py (+14/-0)
ubuntuone/platform/sync_menu/__init__.py (+41/-0)
ubuntuone/platform/sync_menu/common.py (+43/-0)
ubuntuone/platform/sync_menu/linux.py (+230/-0)
ubuntuone/syncdaemon/main.py (+14/-2)
To merge this branch: bzr merge lp://qastaging/~diegosarmentero/ubuntuone-client/ubuntuone-client-syncc
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+124968@code.qastaging.launchpad.net

Commit message

- Adding SyncMenu to u1-client (LP: #1042343).

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

You can test this branch in Q like this:

sudo apt-get build-dep indicator-sync
bzr branch lp:indicator-sync
cd indicator-sync
./autogen.sh; make

check out the README file inside the example folder, and follow those instructions, but instead executing the C example, run u1-client from this branch.

Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

It's necessary also to install:
sudo apt-get install gir1.2-syncmenu-0.1

Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :
Revision history for this message
Roberto Alsina (ralsina) wrote :

Looks good to me. Could not run it because Q is not cooperating today.

review: Approve
Revision history for this message
Alejandro J. Cura (alecu) wrote :

The code on this branch looks fine, but testing this branch IRL shows a very noticeable regression:
Syndaemon running from trunk uses 0% cpu while idle. This branch uses 1% cpu on my machine (+1% cpu for the sync indicator processes), due to the constant updating of the menu.

I think we should both reduce the time between updates for this branch, and create a new bug, and try to come up with a less resource intensive approach, like having the status aggregator code calling some callback in this module whenever there's transfer progress (and even so, no more often than every two or three seconds).

---

Small issue: all occurrences similar to:

213 + def fake_open(url):
214 + data.append(url)
215 +
216 + self.patch(linux.webbrowser, "open", fake_open)

Can be replaced with just this line:

213 + self.patch(linux.webbrowser, "open", data.append)

review: Needs Information
Revision history for this message
Alejandro J. Cura (alecu) wrote :

After discussing on IRC, we decided to land this branch as is and work on a fix for the cpu issue in a different branch.

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (28.2 KiB)

The attempt to merge lp:~diegosarmentero/ubuntuone-client/ubuntuone-client-syncc into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.69
checking for automake >= 1.10...
  testing automake-1.12... not found.
  testing automake-1.11... found 1.11.5
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking how to create a ustar tar archive... gnutar
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking how to print strings... printf
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whe...

1360. By Diego Sarmentero

Making the syncmenu integration not be required on linux

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches