ubuntuone-dev-tools

Merge lp:~mandel/ubuntuone-dev-tools/correct-cleanup into lp:ubuntuone-dev-tools

  1. correct-cleanup
  2. Merge into trunk
Proposed by Manuel de la Peña on 2012-05-22
Status: Merged
Approved by: Manuel de la Peña on 2012-05-22
Approved revision: 72
Merged at revision: 72
Proposed branch: lp:~mandel/ubuntuone-dev-tools/correct-cleanup
Merge into: lp:ubuntuone-dev-tools
Diff against target: 14 lines (+2/-1)
1 file modified
ubuntuone/devtools/testcases/txsocketserver.py (+2/-1)
To merge this branch: bzr merge lp:~mandel/ubuntuone-dev-tools/correct-cleanup
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) Approve on 2012-05-22
Diego Sarmentero (community) 2012-05-22 Approve on 2012-05-22
Review via email: mp+106791@code.launchpad.net

Commit Message

- Ensure that there is a server_runner and trust the server to perform the correct cleanup instead of checking if the factories are there (LP: #1002834).

Description of the Change

- Ensure that there is a server_runner and trust the server to perform the correct cleanup instead of checking if the factories are there (LP: #1002834).

To post a comment you must log in.
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Eric Casteleijn (thisfred) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/devtools/testcases/txsocketserver.py'
2--- ubuntuone/devtools/testcases/txsocketserver.py 2012-04-26 14:19:12 +0000
3+++ ubuntuone/devtools/testcases/txsocketserver.py 2012-05-22 12:23:17 +0000
4@@ -274,8 +274,9 @@
5
6 def tear_down_server_client(self):
7 """Clean the server and client."""
8- if self.server_factory and self.client_factory:
9+ if self.server_runner:
10 return self.server_runner.clean_up()
11+ return defer.succeed(None)
12
13
14 class TCPServerTestCase(ServerTestCase):

Subscribers

People subscribed via source and target branches

to all changes: