lp:~dobey/ubuntuone-dev-tools/updates-2992

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-dev-tools/stable-3-0 at revision 53

dobey (community): Abstain on 2012-01-17

Brian Curtin (community): Approve on 2012-01-17

Diego Sarmentero (community): Approve on 2012-01-17

Diff: 1307 lines (+1145/-30)

14 files modified

bin/u1lint.bat (+17/-0)
bin/u1trial.bat (+17/-0)
data/squid.conf.in (+120/-0)
run-tests (+1/-1)
setup.py (+12/-4)
ubuntuone/devtools/services/__init__.py (+53/-0)
ubuntuone/devtools/services/dbus.py (+8/-23)
ubuntuone/devtools/services/squid.py (+245/-0)
ubuntuone/devtools/services/tests/test_dbus.py (+1/-1)
ubuntuone/devtools/services/tests/test_squid.py (+334/-0)
ubuntuone/devtools/testcases/dbus.py (+1/-1)
ubuntuone/devtools/testcases/squid.py (+58/-0)
ubuntuone/devtools/testcases/tests/__init__.py (+16/-0)
ubuntuone/devtools/testcases/tests/test_squid_testcase.py (+262/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

53. By dobey on 2012-01-17

Merge updates from trunk for 2.99.2 release

52. By dobey on 2012-01-03

[release] 2.99.1

51. By dobey on 2011-12-22

[release] 2.99.0

50. By dobey on 2011-12-20

Switch xdg.BaseDirectory usage over to using dirspec.basedir instead

49. By Manuel de la Peña on 2011-11-23

Refactor the dbus test case to accommodate the code for the addition of extra test cases.

48. By dobey on 2011-11-22

Use the Options handling API of trial so unhandled options get passed through
Fix some style issues
Make test_dbus work with --loop argument

47. By dobey on 2011-11-14

Bump the version for trunk

46. By Natalia Bidart on 2011-11-11

- Import qt4reactor properly (LP: #888722).

45. By Natalia Bidart on 2011-11-10

* Grab xdg_data_dirs from ubuntu_sso (LP: #888619).

44. By Tim Cole on 2011-11-07

Expose factory function for checker test cases.