Merge lp:~mterry/ubuntuone-couch/auth-fixes into lp:ubuntuone-couch
| Status: | Rejected |
|---|---|
| Rejected by: | Natalia Bidart on 2015-10-01 |
| Proposed branch: | lp:~mterry/ubuntuone-couch/auth-fixes |
| Merge into: | lp:ubuntuone-couch |
| Diff against target: |
34 lines (+3/-3) 2 files modified
ubuntuone/couch/auth.py (+2/-2) ubuntuone/tests/test_auth.py (+1/-1) |
| To merge this branch: | bzr merge lp:~mterry/ubuntuone-couch/auth-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | 2012-06-21 | Approve on 2012-06-27 | |
|
Review via email:
|
|||
Commit Message
Fix the import for the dbus_service module renaming.
Increase the request timeout to 30 seconds per megabyte.
Description of the Change
This branch fixes two issues:
Recently, some code moved around in ubuntuone-client, so we have to fix our import.
Secondly, some users in bug 844369 (time outs in Deja Dup uploading) have reported that increasing the timeout per-megabyte from 10s to 30s helped those on slow connections. So I'm proposing that change in this branch too.
| Michael Terry (mterry) wrote : | # |
Done! Please commit as you see fit. (I linked this bug to bug 844369, but I'm not 100% confident it will actually fix it, just help ameliorate it).
| Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mterry/ubuntuone-couch/auth-fixes into lp:ubuntuone-couch failed. Below is the output from the failed tests.
Running test suite for ubuntuone
Adding path
Xlib: extension "RANDR" missing on display ":99".
Traceback (most recent call last):
File "/usr/bin/u1trial", line 269, in <module>
main()
File "/usr/bin/u1trial", line 265, in main
TestRunner(
File "/usr/bin/u1trial", line 187, in run
options.
File "/usr/bin/u1trial", line 162, in _collect_tests
module_suite = self._load_
File "/usr/bin/u1trial", line 90, in _load_unittest
module = __import__(modpath, None, None, [""])
File "/mnt/tarmac/
from ubuntuone.couch import (
File "/mnt/tarmac/
from ubuntuone.
File "/mnt/tarmac/
from ubuntuone.
ImportError: No module named dbus_service
| Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mterry/ubuntuone-couch/auth-fixes into lp:ubuntuone-couch failed. Below is the output from the failed tests.
Running test suite for ubuntuone
Traceback (most recent call last):
File "/usr/bin/u1trial", line 341, in <module>
main()
File "/usr/bin/u1trial", line 321, in main
suite = trial_runner.
File "/usr/bin/u1trial", line 192, in get_suite
config[
File "/usr/bin/u1trial", line 176, in _collect_tests
module_suite = self._load_
File "/usr/bin/u1trial", line 116, in _load_unittest
module = __import__(modpath, None, None, [""])
File "/mnt/tarmac/
from ubuntuone.
ImportError: No module named linux
| Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mterry/ubuntuone-couch/auth-fixes into lp:ubuntuone-couch failed. Below is the output from the failed tests.
Running test suite for ubuntuone
Traceback (most recent call last):
File "/usr/lib/
raise problem
ubuntuone.
[FAIL]
Traceback (most recent call last):
File "/usr/lib/
raise problem
ubuntuone.
[FAIL]
Traceback (most recent call last):
File "/usr/lib/
raise problem
ubuntuone.
[FAIL]
Traceback (most recent call last):
File "/usr/lib/
raise problem
ubuntuone.
[FAIL]
Traceback (most recent call last):
File "/usr/lib/
raise problem
ubuntuone.
[FAIL]
Traceback (most recent call last):
File "/usr/lib/
raise problem
ubuntuone.
[FAIL]
Traceback (most recent call last):
File "/usr/lib/
raise problem
ubuntuone.
[FAIL]
Traceback (most recent call last):
File "/usr/lib/
raise problem
ubuntuone.
[FAIL]
ubuntuone.
QueryTestCase
test_
test_
test_request ... [OK]
test_
test_
test_
test_
test_
| Michael Terry (mterry) wrote : | # |
These test failures didn't seem related to this branch. Can this merge be tried again?
| dobey (dobey) wrote : | # |
On Wed, 2012-08-01 at 16:08 +0000, Michael Terry wrote:
> These test failures didn't seem related to this branch. Can this
> merge be tried again?
They are unrelated, but they will just occur again. The failures are due
to a check in the test runner, for which ubuntuone-couch has not been
updated to deal with.
The branch is fine though, and I think it's fine to ship those changes
as a patch in the Ubuntu package of ubuntuone-couch for now. I'll see if
I can't come up with a better solution in the next couple of weeks, to
allow us to drop ubuntuone-couch completely out of the archive for beta.
| Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mterry/ubuntuone-couch/auth-fixes into lp:ubuntuone-couch failed. Below is the output from the failed tests.
Running test suite for ubuntuone
Traceback (most recent call last):
File "/usr/bin/u1trial", line 337, in <module>
main()
File "/usr/bin/u1trial", line 313, in main
'installed. You can find it here: %s' % reactor.
AttributeError: 'module' object has no attribute 'REACTOR_URL'
| Natalia Bidart (nataliabidart) wrote : | # |
Setting MP as Rejected to reduce numbers of landing candidates in @reviewlist.
Change status again if this MP is still current.
Unmerged revisions
- 17. By Michael Terry on 2012-07-11
-
and fix a test usage of credentials.linux
- 16. By Michael Terry on 2012-06-26
-
fix import and add more time for requests
Looks ok to me. But it would be nice to have a bug for this. Can you open one, and commit --unchanged --fixes=lp:$BUGNUM to link it to this branch? Thanks.