Ubuntu Single Sign On Client

Merge lp:~mandel/ubuntu-sso-client/fix-activation-tests into lp:ubuntu-sso-client

  1. fix-activation-tests
  2. Merge into trunk
Proposed by Manuel de la Peña on 2012-04-10
Status: Merged
Approved by: Manuel de la Peña on 2012-04-18
Approved revision: 975
Merged at revision: 947
Proposed branch: lp:~mandel/ubuntu-sso-client/fix-activation-tests
Merge into: lp:ubuntu-sso-client
Prerequisite: lp:~mandel/ubuntu-sso-client/fix-webclient-tests
Diff against target: 27 lines (+3/-2)
2 files modified
ubuntu_sso/utils/tcpactivation.py (+2/-1)
ubuntu_sso/utils/tests/test_tcpactivation.py (+1/-1)
To merge this branch: bzr merge lp:~mandel/ubuntu-sso-client/fix-activation-tests
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve on 2012-04-13
Diego Sarmentero (community) 2012-04-10 Approve on 2012-04-11
Review via email: mp+101411@code.launchpad.net

Commit Message

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

Description of the Change

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

To post a comment you must log in.
lp:~mandel/ubuntu-sso-client/fix-activation-tests updated on 2012-04-11
963. By Manuel de la Peña on 2012-04-11

Merged fix-webclient-tests into fix-activation-tests.

964. By Manuel de la Peña on 2012-04-11

Link bug.

965. By Manuel de la Peña on 2012-04-11

Use the ip and not localhost.

966. By Manuel de la Peña on 2012-04-11

Fix lint.

967. By Manuel de la Peña on 2012-04-11

Merged fix-webclient-tests into fix-activation-tests.

968. By Manuel de la Peña on 2012-04-11

Merged fix-webclient-tests into fix-activation-tests.

Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
lp:~mandel/ubuntu-sso-client/fix-activation-tests updated on 2012-04-12
969. By Manuel de la Peña on 2012-04-12

Merged fix-webclient-tests into fix-activation-tests.

970. By Manuel de la Peña on 2012-04-12

Merged fix-webclient-tests into fix-activation-tests.

Brian Curtin (brian.curtin) :
review: Approve
lp:~mandel/ubuntu-sso-client/fix-activation-tests updated on 2012-04-17
971. By Manuel de la Peña on 2012-04-16

Merged fix-webclient-tests into fix-activation-tests.

972. By Manuel de la Peña on 2012-04-16

Merged fix-webclient-tests into fix-activation-tests.

973. By Manuel de la Peña on 2012-04-17

Merged fix-webclient-tests into fix-activation-tests.

974. By Manuel de la Peña on 2012-04-17

Timestamp does support the use of iris.

975. By Manuel de la Peña on 2012-04-17

Merged fix-webclient-tests into fix-activation-tests.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/utils/tcpactivation.py'
2--- ubuntu_sso/utils/tcpactivation.py 2012-04-09 17:38:24 +0000
3+++ ubuntu_sso/utils/tcpactivation.py 2012-04-17 20:34:19 +0000
4@@ -114,8 +114,9 @@
5 """Check if the instance is already running."""
6 factory = PortDetectFactory()
7 # pylint: disable=E1101
8- reactor.connectTCP(LOCALHOST, self.config.port, factory)
9+ connector = reactor.connectTCP(LOCALHOST, self.config.port, factory)
10 result = yield factory.is_listening()
11+ connector.disconnect()
12 defer.returnValue(result)
13
14
15
16=== modified file 'ubuntu_sso/utils/tests/test_tcpactivation.py'
17--- ubuntu_sso/utils/tests/test_tcpactivation.py 2012-04-09 17:38:24 +0000
18+++ ubuntu_sso/utils/tests/test_tcpactivation.py 2012-04-17 20:34:19 +0000
19@@ -226,7 +226,7 @@
20 # pylint: disable=E1101
21 listener = reactor.listenTCP(SAMPLE_PORT, f,
22 interface=tcpactivation.LOCALHOST)
23- self.addCleanup(listener.stopListening)
24+ self.addCleanup(defer.maybeDeferred, listener.stopListening)
25 ad = ActivationDetector(self.config)
26 result = yield ad.is_already_running()
27 self.assertTrue(result, "It should be already running.")

Subscribers

People subscribed via source and target branches