Merge lp:~mikemc/ubuntuone-client/fix-1037432-run-mac-tests into lp:ubuntuone-client

Proposed by Mike McCracken on 2012-08-16
Status: Merged
Approved by: dobey on 2012-08-24
Approved revision: 1292
Merged at revision: 1295
Proposed branch: lp:~mikemc/ubuntuone-client/fix-1037432-run-mac-tests
Merge into: lp:ubuntuone-client
Diff against target: 15 lines (+3/-1)
1 file modified
run-mac-tests (+3/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-client/fix-1037432-run-mac-tests
Reviewer Review Type Date Requested Status
dobey (community) 2012-08-16 Approve on 2012-08-24
Review via email: mp+119842@code.launchpad.net

Commit Message

- Remove broken buildout env vars, and add lint to mac test script. (LP: #1037432)

Description of the Change

- Remove broken buildout env vars, and add lint to mac test script. (LP: #1037432)

TO TEST: run the run-mac-tests script, and expect many failures.

To post a comment you must log in.
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run-mac-tests'
2--- run-mac-tests 2012-08-01 14:25:58 +0000
3+++ run-mac-tests 2012-08-16 06:56:19 +0000
4@@ -42,8 +42,10 @@
5 cp windows/clientdefs.py ubuntuone/clientdefs.py
6 cp windows/logging.conf data/logging.conf
7 # execute the tests with a number of ignored linux only modules
8-python $u1trial --reactor=twisted -i "test_linux.py,test_windows.py" -p tests/platform/linux "$MODULE"
9+u1trial --reactor=twisted -i "test_linux.py,test_windows.py" -p tests/platform/linux "$MODULE"
10 rm -rf _trial_temp
11 rm -rf build
12
13 python tests/platform/check_reactor_import.py
14+
15+USE_PYFLAKES="true" u1lint

Subscribers

People subscribed via source and target branches