lp:~diegosarmentero/ubuntu-sso-client/mac-port

Branch merges

Merged into lp:ubuntu-sso-client at revision 952

Eric Casteleijn (community): Approve on 2012-05-01

Manuel de la Peña (community): Approve on 2012-05-01

Diff: 1655 lines (+825/-464)

25 files modified

data/qt/darwin.qss (+5/-0)
data/qt/resources.qrc (+1/-0)
run-mac-tests (+56/-0)
run-tests (+1/-1)
ubuntu_sso/keyring/__init__.py (+2/-6)
ubuntu_sso/keyring/linux.py (+0/-6)
ubuntu_sso/keyring/pykeyring.py (+2/-3)
ubuntu_sso/keyring/tests/test_pykeyring.py (+8/-9)
ubuntu_sso/main/__init__.py (+27/-1)
ubuntu_sso/main/darwin.py (+110/-0)
ubuntu_sso/main/perspective_broker.py (+352/-0)
ubuntu_sso/main/tests/test_darwin.py (+43/-0)
ubuntu_sso/main/tests/test_windows.py (+3/-1)
ubuntu_sso/main/windows.py (+23/-335)
ubuntu_sso/networkstate/__init__.py (+11/-11)
ubuntu_sso/networkstate/darwin.py (+95/-0)
ubuntu_sso/networkstate/linux.py (+7/-39)
ubuntu_sso/networkstate/networkstates.py (+51/-0)
ubuntu_sso/networkstate/tests/test_linux.py (+9/-10)
ubuntu_sso/qt/__init__.py (+7/-0)
ubuntu_sso/qt/main/__init__.py (+1/-1)
ubuntu_sso/utils/__init__.py (+9/-6)
ubuntu_sso/utils/linux.py (+0/-31)
ubuntu_sso/utils/qtwisted.py (+1/-3)
ubuntu_sso/utils/tests/test_qtwisted.py (+1/-1)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #985612: runtests is unsuable on darwin

Undecided

Fix Released

Link a bug report

Related blueprints

955. By Diego Sarmentero on 2012-04-27

run tests script doesn't setup the PATH, the env-mac script is required if we are using the buildout

954. By Diego Sarmentero on 2012-04-27

ignoring test_ipc

953. By Diego Sarmentero on 2012-04-27

merge

952. By Diego Sarmentero on 2012-04-27

Updating run mac tests script

951. By Diego Sarmentero on 2012-04-25

merge

950. By Diego Sarmentero on 2012-04-24

merge and adding run-mac-tests

949. By Brian Curtin on 2012-04-20

- Prepend existing PYTHONPATH so tests work on Jenkins, which sets its own.

948. By Brian Curtin on 2012-04-20

- Make run-tests.bat work with the new buildout environment.

947. By Manuel de la Peña on 2012-04-18

- Fixed tcp activation tests to clean resources correctly (LP: #960436).

946. By Manuel de la Peña on 2012-04-18

- Added the use of the new added webserver that cleans resources correctly (LP: #960436).