2008-10-07 Christopher Blizzard <blizzard@0xdeadbeef.com>
authorblizzard <blizzard@ae879524-a8bd-4c4c-a5ea-74d2e5fc5a2c>
Wed, 8 Oct 2008 00:28:03 +0000 (00:28 +0000)
committerblizzard <blizzard@ae879524-a8bd-4c4c-a5ea-74d2e5fc5a2c>
Wed, 8 Oct 2008 00:28:03 +0000 (00:28 +0000)
        * 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
services/command/controller.py
tests/twisted/network/test_newsite.py

index c4dd978..1e2b8bb 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
index 9c06938..b3a1a59 100644 (file)
@@ -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)
index 6fa14b8..2081401 100644 (file)
@@ -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")