Merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1024623-install-confs into lp://qastaging/ubuntuone-control-panel
Proposed by
Mike McCracken
| Status: | Merged |
|---|---|
| Approved by: | Alejandro J. Cura |
| Approved revision: | 343 |
| Merged at revision: | 340 |
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1024623-install-confs |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
283 lines (+203/-1) 7 files modified
run-tests.bat (+1/-1) ubuntuone/controlpanel/gui/qt/main/__init__.py (+4/-0) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+8/-0) ubuntuone/controlpanel/utils/__init__.py (+10/-0) ubuntuone/controlpanel/utils/darwin.py (+91/-0) ubuntuone/controlpanel/utils/tests/test_darwin.py (+78/-0) ubuntuone/controlpanel/utils/tests/test_utils.py (+11/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1024623-install-confs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alejandro J. Cura (community) | Approve | ||
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Add darwin-only function to perform first-run "install" steps (LP: #1024623)
Description of the change
- Add darwin-only function to perform first-run "install" steps (LP: #1024623)
Function is set to no_op in utils.__init__ for linux and windows.
This function does first-run install stuff, but it just copies the default conf files to the right place if they're not there, which is better than using the presence or absence of just one file/directory to signal "first-run".
Also, excludes "test_darwin.py" on windows. This is the first branch to add a test_darwin.py.
Tested on all three platforms.
To post a comment you must log in.
Revision history for this message
| Roberto Alsina (ralsina) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The code looks good. I was unable to run the tests though, because something on my dev environment is broken.