Paul Hummer has proposed merging lp:~rockstar/launchpad/fix-kill-test-services
into lp:launchpad/devel.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
The Launchpad librarian can get wedged in some pretty fantastic ways. Today, I
learned about a bunch of them. My librarian had left files around on my
system, and those files prevented the librarian from starting up again.
Usually, the fix for this is to call bin/kill-test-services. That didn't work,
so I dug into what makes the librarian tick. As I looked for these bad files
and deleted them, it dawned on me that it'd be much better to just fix
bin/kill-test-services, fixing a bug AND fixing my issue at the same time.
It looks like we never should have imported LibrarianTestSetup from harness,
and now that harness.py has been deleted, it broke the script. I changed the
import path. Also, TacLibrarianSetup doesn't seem to exist anymore. Go figure.
--
https://code.launchpad.net/~rockstar/launchpad/fix-kill-test-services/+merge/38870
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~rockstar/launchpad/fix-kill-test-services into lp:launchpad/devel.
=== modified file 'buildout-templates/bin/kill-test-services.in'
--- buildout-templates/bin/kill-test-services.in 2010-04-20 19:10:35 +0000
+++ buildout-templates/bin/kill-test-services.in 2010-10-19 18:08:46 +0000
@@ -19,8 +19,7 @@
import sys
from canonical.testing.layers import MemcachedLayer
-from canonical.librarian.ftests.harness import (
- LibrarianTestSetup, TacLibrarianTestSetup)
+from canonical.librarian.testing.server import LibrarianTestSetup
from lp.services.osutils import kill_by_pidfile
@@ -32,7 +31,6 @@
kill_by_pidfile(MemcachedLayer.getPidFile())
print "done."
print "Killing Librarian....",
- TacLibrarianTestSetup().tearDown()
LibrarianTestSetup().tearDownRoot()
print "done."
return 0
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
