2008-10-07 Christopher Blizzard <blizzard@0xdeadbeef.com>

        * 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

diff --git a/ChangeLog b/ChangeLog
index c4dd9783a70199f5e3bef50d21b9345e4403fc61..1e2b8bbf049c0fcd5176ae7327d35af9270eb636 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-07  Christopher Blizzard  <blizzard@0xdeadbeef.com>
+
+       * 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  <blizzard@0xdeadbeef.com>
 
        * tests/nose/test_newsite.py (TestNewSite.test_delicious): Add

diff --git a/services/command/controller.py b/services/command/controller.py
index 9c06938babcbb21c355d22f87a0db10946d94a7f..b3a1a5925005d6b793cd6b9cc2af0aa186f85352 100644 (file)
--- 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 6fa14b89243d7792c3d5aa6e3f7a0b2be0d81303..2081401ed708cbb82edf2062975fbba49c1a9780 100644 (file)
--- 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")