Merge lp://staging/~facundo/magicicada-client/xenial-tests into lp://staging/magicicada-client
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 1431 |
| Merged at revision: | 1430 |
| Proposed branch: | lp://staging/~facundo/magicicada-client/xenial-tests |
| Merge into: | lp://staging/magicicada-client |
| Diff against target: |
4551 lines (+19/-4104) 36 files modified
contrib/testing/testcase.py (+0/-2) data/syncdaemon.conf (+0/-7) dependencies.txt (+0/-1) po/POTFILES.in (+0/-1) ubuntuone/platform/ipc/ipc_client.py (+0/-13) ubuntuone/platform/ipc/linux.py (+0/-18) ubuntuone/platform/ipc/perspective_broker.py (+0/-15) ubuntuone/platform/notification/__init__.py (+0/-43) ubuntuone/platform/notification/linux.py (+0/-68) ubuntuone/platform/notification/windows.py (+0/-46) ubuntuone/platform/sync_menu/linux.py (+5/-9) ubuntuone/platform/tests/filesystem_notifications/__init__.py (+2/-2) ubuntuone/platform/tests/ipc/test_external_interface.py (+0/-6) ubuntuone/platform/tests/notification/__init__.py (+0/-27) ubuntuone/platform/tests/notification/test_linux.py (+0/-125) ubuntuone/platform/tests/sync_menu/test_linux.py (+0/-13) ubuntuone/platform/tests/test_tools.py (+0/-25) ubuntuone/platform/tests/windows/run_sdtool.py (+0/-3) ubuntuone/platform/tools/__init__.py (+0/-10) ubuntuone/status/__init__.py (+0/-27) ubuntuone/status/aggregator.py (+0/-946) ubuntuone/status/logger.py (+0/-49) ubuntuone/status/notification.py (+0/-43) ubuntuone/status/tests/__init__.py (+0/-27) ubuntuone/status/tests/test_aggregator.py (+0/-1806) ubuntuone/syncdaemon/config.py (+1/-11) ubuntuone/syncdaemon/hash_queue.py (+2/-27) ubuntuone/syncdaemon/interaction_interfaces.py (+0/-21) ubuntuone/syncdaemon/main.py (+0/-15) ubuntuone/syncdaemon/status_listener.py (+0/-166) ubuntuone/syncdaemon/tests/test_config.py (+0/-48) ubuntuone/syncdaemon/tests/test_eq_inotify.py (+9/-10) ubuntuone/syncdaemon/tests/test_hashqueue.py (+0/-28) ubuntuone/syncdaemon/tests/test_interaction_interfaces.py (+0/-20) ubuntuone/syncdaemon/tests/test_main.py (+0/-14) ubuntuone/syncdaemon/tests/test_status_listener.py (+0/-412) |
| To merge this branch: | bzr merge lp://staging/~facundo/magicicada-client/xenial-tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Natalia Bidart | Approve | ||
|
Review via email:
|
|||
Commit message
Brought tests (almost, see description) back to life.
Description of the change
Brought tests (almost, see below) back to life.
What I did:
- Removed all traces of to-desktop notifications (the bubbles), including all aggregation mechanisms (that were in place for not spamming to much with the bubbles).
- Removed a failing FixedOrderedDict that was there only to support Python < 2.7
- Fixed some inotify-related tests: it looks that lib changed and now it puts an internal object to None when stopping, and this made our tests to fail because we were stopping inotify too prematurely. To fix those cases I changed two situations:
- We were stopping the test (and inotify) after getting one signal from inotify, so we kind of stopping inotify in the middle of its work; for this I just stopped the test in a reactor callLater, to free the CPU hold and let inotify finish ok.
- Removed some watches when test successful so we avoided sending more signals when doing the test cleanup.
What I did NOT, will happen in next branches:
- Remove all Qt traces (note: this will include the "proxy" support mechanisms
- Remove everything about "sync_menu" and "launcher".
Why the "almost" above: in ./run/tests it tries to exercise proxy tests using qt4reactor, and the qt4reactor is not possible to install in xenial because it depends on mysql-common, that 404s.
| Natalia Bidart (nataliabidart) wrote | # |
Hi!
I have no issues with the removal, but please note that the packages you mention are available in xenial:
nessita@miro:~$ lsb_release -a
No LSB modules are available.
Distributor ID: Ubuntu
Description: Ubuntu 16.04.1 LTS
Release: 16.04
Codename: xenial
nessita@miro:~$ sudo apt-cache policy python-qt4reactor
python-qt4reactor:
Installed: 1.0-1fakesync1
Candidate: 1.0-1fakesync1
The 404 you are getting is likely caused by an outdated apt list, be sure to:
sudo apt-get update
before trying to install any particular package.