Merge lp://staging/~dobey/ubuntuone-client/update-4-2 into lp://staging/ubuntuone-client/stable-4-2
Status: | Merged |
---|---|
Merged at revision: | 1360 |
Proposed branch: | lp://staging/~dobey/ubuntuone-client/update-4-2 |
Merge into: | lp://staging/ubuntuone-client/stable-4-2 |
Diff against target: |
2213 lines (+517/-582) 43 files modified
bin/u1sdtool (+3/-8) bin/ubuntuone-syncdaemon (+4/-8) contrib/dbus-docs (+3/-6) contrib/login_email_password.py (+3/-9) contrib/testing/testcase.py (+42/-3) libsyncdaemon/test-libsyncdaemon.c (+3/-1) tests/platform/filesystem_notifications/common.py (+34/-33) tests/platform/filesystem_notifications/test_darwin.py (+62/-15) tests/platform/filesystem_notifications/test_windows.py (+11/-2) tests/platform/ipc/test_external_interface.py (+3/-2) tests/platform/ipc/test_perspective_broker.py (+21/-2) tests/platform/notification/test_linux.py (+4/-15) tests/platform/os_helper/test_linux.py (+5/-10) tests/platform/test_tools.py (+5/-20) tests/proxy/test_tunnel_server.py (+9/-1) tests/syncdaemon/test_action_queue.py (+14/-5) tests/syncdaemon/test_eq_inotify.py (+14/-2) tests/syncdaemon/test_eventqueue.py (+9/-4) tests/syncdaemon/test_files_search.py (+0/-91) tests/syncdaemon/test_fsm.py (+81/-94) tests/syncdaemon/test_interaction_interfaces.py (+7/-0) tests/syncdaemon/test_main.py (+3/-2) tests/syncdaemon/test_offloadqueue.py (+2/-1) tests/syncdaemon/test_sync.py (+24/-9) tests/syncdaemon/test_tritcask.py (+31/-0) tests/syncdaemon/test_vm.py (+63/-28) ubuntuone/platform/filesystem_notifications/monitor/common.py (+6/-20) ubuntuone/platform/filesystem_notifications/monitor/darwin/fsevents_client.py (+2/-5) ubuntuone/platform/filesystem_notifications/monitor/windows.py (+0/-3) ubuntuone/platform/notification/__init__.py (+1/-3) ubuntuone/platform/notification/linux.py (+11/-29) ubuntuone/platform/os_helper/linux.py (+5/-10) ubuntuone/platform/sync_menu/linux.py (+3/-13) ubuntuone/platform/tools/__init__.py (+0/-57) ubuntuone/platform/tools/perspective_broker.py (+7/-1) ubuntuone/proxy/tunnel_server.py (+3/-1) ubuntuone/syncdaemon/action_queue.py (+3/-3) ubuntuone/syncdaemon/files_search.py (+0/-50) ubuntuone/syncdaemon/filesystem_manager.py (+13/-6) ubuntuone/syncdaemon/interaction_interfaces.py (+2/-2) ubuntuone/syncdaemon/main.py (+0/-3) ubuntuone/syncdaemon/tritcask.py (+1/-0) ubuntuone/syncdaemon/volume_manager.py (+0/-5) |
To merge this branch: | bzr merge lp://staging/~dobey/ubuntuone-client/update-4-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
Review via email: mp+145402@code.staging.launchpad.net |
Commit message
[Mike McCracken]
- Fix support for searching local files in UDFs. (LP: #1101271)
- Clean up test suite for filesystem_
- Patch NetworkManagerState in test_interactio
- Remove intermittent failures in ConnectionTestCase: tests now wait until test server is fully initialized.
- Reduce number of files test suite opens and doesn't close.
- Use fake FS Monitor to avoid starting PB IPC connections that don't get stopped correctly.
- Use fake callInThread to test ZipQueue, works around bug in threadpool closing on darwin.
- Remove unused and potentially incorrect wait_no_
- Speed up many tests by waiting less time for nothing to happen.
- Clean up usage of Filesystem Monitor in test suite.
- Mock out NetworkState in IPCTestCase, avoids starting a thread per test case on darwin and windows.
- Change PB IPC to use IPCError exceptions, but skip test due to PB in-process quirks.
- Fix AutoconnectConf
[Guillermo Gonzalez]
- Fix tritcask DataFile.write to flush after write before calling fd.tell().
[Rodney Dawes]
- Remove most of the remaining support for older static glib bindings.
- Don't use g_type_init with new versions of glib.
- Drop the dependency on simplejson and use the standard json module.
[Alejandro J. Cura]
- Use a standard LC_CTYPE locale when the LANG is turkish. (LP: #997326).
The attempt to merge lp:~dobey/ubuntuone-client/update-4-2 into lp:ubuntuone-client/stable-4-2 failed. Below is the output from the failed tests.
/usr/bin/ gnome-autogen. sh MACRO_DIR, `m4'. unknown- linux-gnu unknown- linux-gnu
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.6
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_
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-
checking host system type... x86_64-
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 whether the sh...