Merge lp:~jamesh/ubuntu-scopes/tomboy-tests into lp:~submarine/ubuntu-scopes/tomboy

[James Henstridge]

Shut down the mock tomboy server explicitly in the tearDownClass() method so we don't leave any stale processes hanging around.

Shut down the mock tomboy server explicitly in the tearDownClass() method so we don't leave any stale processes hanging around.

I had assumed that the spawned process would exit automatically, since the docs say it will when the bus it is connected to closes.

[lp:~jamesh/ubuntu-scopes/tomboy-tests]

17. By James Henstridge on 2013-03-18

Chain up to base class implementation of tearDownClass()

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-tomboy-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-tomboy-raring-amd64-ci/1/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-tomboy-ci/1/rebuild

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Looking good, thanks :)

review: Approve

=== modified file 'tests/test_tomboy.py'
--- tests/test_tomboy.py	2013-03-18 07:23:06 +0000
+++ tests/test_tomboy.py	2013-03-18 11:05:25 +0000
@@ -65,6 +65,12 @@
         tomboy.AddMethod(TOMBOY_IFACE, 'GetNoteContents', 's', 's',
                          '''ret = '{} contents'.format(args[0])''')
 
+    @classmethod
+    def tearDownClass(cls):
+        cls.tomboy_proc.terminate()
+        cls.tomboy_proc.wait()
+        super(TestTomboy, cls).tearDownClass()
+
     def test_valid_search(self):
         result_set = self.perform_query('foo')
         self.assertEqual(len(result_set.results), 1)