lp:~nataliabidart/magicicada-server/no-u1-devtools

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:magicicada-server at revision 70

Facundo Batista: Approve on 2016-08-21

Diff: 2948 lines (+433/-855)

28 files modified

build/config-manager.txt (+0/-1)
dependencies-devel.txt (+1/-1)
lib/ubuntuone/supervisor/heartbeat_listener.py (+0/-13)
lib/utilities/testlib.py (+4/-3)
magicicada/metrics/__init__.py (+2/-6)
magicicada/metrics/tests/test_base.py (+21/-39)
magicicada/monitoring/reactor.py (+20/-16)
magicicada/monitoring/tests/test_reactor.py (+3/-5)
magicicada/server/auth.py (+1/-1)
magicicada/server/content.py (+6/-7)
magicicada/server/integtests/test_server_scan.py (+0/-5)
magicicada/server/integtests/test_sync.py (+10/-31)
magicicada/server/logger.py (+0/-204)
magicicada/server/server.py (+36/-76)
magicicada/server/ssl_proxy.py (+2/-4)
magicicada/server/stats.py (+4/-8)
magicicada/server/testing/aq_helpers.py (+10/-5)
magicicada/server/testing/testcase.py (+1/-19)
magicicada/server/tests/test_auth.py (+25/-34)
magicicada/server/tests/test_basic.py (+14/-29)
magicicada/server/tests/test_content.py (+73/-111)
magicicada/server/tests/test_notify_delivery.py (+24/-14)
magicicada/server/tests/test_server.py (+106/-185)
magicicada/server/tests/test_ssl_proxy.py (+13/-32)
magicicada/settings/__init__.py (+50/-3)
magicicada/settings/api_server.py (+0/-2)
magicicada/settings/testing.py (+4/-0)
test (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

87. By Natalia Bidart on 2016-08-23

Allow for verbosity to be set for tests.

86. By Natalia Bidart on 2016-08-18

Fixed pending tests.

85. By Natalia Bidart on 2016-08-14

Merged trunk into no-u1-devtools.

84. By Natalia Bidart on 2016-08-08

All tests passing for real :-)

83. By Natalia Bidart on 2016-08-07

No more ubuntu_sso symlink.

82. By Natalia Bidart on 2016-08-07

Test fixed

81. By Natalia Bidart on 2016-08-06

Merged trunk in.

80. By Natalia Bidart on 2016-08-06

Less changes against trunk.

79. By Natalia Bidart on 2016-06-08

Less changes against trunk.

78. By Natalia Bidart on 2016-06-08

Merged trunk in.