From a756e2b743fcc949ab0e837ef3ee38f74711b488 Mon Sep 17 00:00:00 2001 From: blizzard Date: Wed, 8 Oct 2008 00:28:03 +0000 Subject: [PATCH] 2008-10-07 Christopher Blizzard * services/command/controller.py (ProtoManager.start): Remove dead code after return. * tests/twisted/network/test_newsite.py (TestNewSite.confirmRelativeLinksReddit): Reddit urls keep changing. Include a www now. git-svn-id: svn://trac.whoisi.com/whoisi/trunk@3 ae879524-a8bd-4c4c-a5ea-74d2e5fc5a2c --- ChangeLog | 9 +++++++++ services/command/controller.py | 5 ----- tests/twisted/network/test_newsite.py | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4dd978..1e2b8bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-10-07 Christopher Blizzard + + * services/command/controller.py (ProtoManager.start): Remove dead + code after return. + + * tests/twisted/network/test_newsite.py (TestNewSite.confirmRelativeLinksReddit): + Reddit urls keep changing. Include a www now. + + 2008-09-30 Christopher Blizzard * tests/nose/test_newsite.py (TestNewSite.test_delicious): Add diff --git a/services/command/controller.py b/services/command/controller.py index 9c06938..b3a1a59 100644 --- a/services/command/controller.py +++ b/services/command/controller.py @@ -45,11 +45,6 @@ class ProtoManager(CommandManager): self.args = args self.work_d = defer.Deferred() return self.doCommand(*args) - d = self.doCommand(*args) - d.addCallback(self.succeeded) - d.addErrback(self.failed) - - return self.work_d def succeeded(self, *args, **kw): print("%s done" % self.uuid) diff --git a/tests/twisted/network/test_newsite.py b/tests/twisted/network/test_newsite.py index 6fa14b8..2081401 100644 --- a/tests/twisted/network/test_newsite.py +++ b/tests/twisted/network/test_newsite.py @@ -272,11 +272,11 @@ class TestNewSite(unittest.TestCase): s.sync() print(s.url) - assert(s.url == "http://reddit.com/") + assert(s.url == "http://www.reddit.com/") print(s.feed) assert(s.feed == "http://www.reddit.com/user/jeresig/.rss") print(s.history[0].link) - assert(re.match("http://reddit.com/.+", s.history[0].link)) + assert(re.match("http://www.reddit.com/.+", s.history[0].link)) assert(self.ns.status == "done") -- 2.30.2