Deluge
diff options
| author | Calum Lind <calumlind+deluge@gmail.com> | 2013-05-01 04:13:05 +0100 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2013-05-01 05:24:36 +0100 |
| commit | 607be461e013438271bdf886a1c48cc961a34cfc (patch) | |
| tree | 65ab3d19616744a45c4696308abb98aaef511d02 | |
| parent | 4dd6308db91a38311317ef5bd0f1bbd6788424e1 (diff) | |
| download | deluge-607be461e013438271bdf886a1c48cc961a34cfc.tar.gz deluge-607be461e013438271bdf886a1c48cc961a34cfc.tar.bz2 deluge-607be461e013438271bdf886a1c48cc961a34cfc.zip | |
Fix and update tests
| -rw-r--r-- | deluge/tests/common.py | 2 | ||||
| -rw-r--r-- | deluge/tests/google.ico | bin | 5430 -> 0 bytes | |||
| -rw-r--r-- | deluge/tests/google.png | bin | 0 -> 640 bytes | |||
| -rw-r--r-- | deluge/tests/test_common.py | 6 | ||||
| -rw-r--r-- | deluge/tests/test_tracker_icons.py | 4 | ||||
| -rw-r--r-- | deluge/transfer.py | 3 |
6 files changed, 11 insertions, 4 deletions
diff --git a/deluge/tests/common.py b/deluge/tests/common.py index 54cab32a4..bbe09dbf2 100644 --- a/deluge/tests/common.py +++ b/deluge/tests/common.py @@ -43,7 +43,7 @@ deluge.main.start_daemon() core = Popen([sys.executable], cwd=CWD, stdin=fp, stdout=PIPE, stderr=PIPE) while True: line = core.stderr.readline() - if "Factory starting on 58846" in line: + if "starting on 58846" in line: time.sleep(0.3) # Slight pause just incase break elif "Couldn't listen on localhost:58846" in line: diff --git a/deluge/tests/google.ico b/deluge/tests/google.ico Binary files differdeleted file mode 100644 index f594697d2..000000000 --- a/deluge/tests/google.ico +++ /dev/null diff --git a/deluge/tests/google.png b/deluge/tests/google.png Binary files differnew file mode 100644 index 000000000..553ad65ba --- /dev/null +++ b/deluge/tests/google.png diff --git a/deluge/tests/test_common.py b/deluge/tests/test_common.py index a7425db36..3fbc658f0 100644 --- a/deluge/tests/test_common.py +++ b/deluge/tests/test_common.py @@ -56,3 +56,9 @@ class CommonTestCase(unittest.TestCase): self.failUnless(VersionSplit("0.14.9") == VersionSplit("0.14.9")) self.failUnless(VersionSplit("0.14.9") > VersionSplit("0.14.5")) self.failUnless(VersionSplit("0.14.10") >= VersionSplit("0.14.9")) + self.failUnless(VersionSplit("1.4.0") > VersionSplit("1.3.900.dev123")) + self.failUnless(VersionSplit("1.3.2rc2.dev1") < VersionSplit("1.3.2-rc2")) + self.failUnless(VersionSplit("1.3.900.dev888") > VersionSplit("1.3.900.dev123")) + self.failUnless(VersionSplit("1.4.0") > VersionSplit("1.4.0.dev123")) + self.failUnless(VersionSplit("1.4.0.dev1") < VersionSplit("1.4.0")) + self.failUnless(VersionSplit("1.4.0a1") < VersionSplit("1.4.0")) diff --git a/deluge/tests/test_tracker_icons.py b/deluge/tests/test_tracker_icons.py index 4f8782d4f..c671b4f3e 100644 --- a/deluge/tests/test_tracker_icons.py +++ b/deluge/tests/test_tracker_icons.py @@ -24,7 +24,7 @@ class TrackerIconsTestCase(unittest.TestCase): def test_get_google_ico(self): # Google doesn't have any icon links # So instead we'll grab its favicon.ico - icon = TrackerIcon(os.path.join(dirname, "google.ico")) + icon = TrackerIcon(os.path.join(dirname, "google.png")) d = icons.get("www.google.com") d.addCallback(self.assertNotIdentical, None) d.addCallback(self.assertEquals, icon) @@ -32,7 +32,7 @@ class TrackerIconsTestCase(unittest.TestCase): def test_get_google_ico_with_redirect(self): # google.com redirects to www.google.com - icon = TrackerIcon(os.path.join(dirname, "google.ico")) + icon = TrackerIcon(os.path.join(dirname, "google.png")) d = icons.get("google.com") d.addCallback(self.assertNotIdentical, None) d.addCallback(self.assertEquals, icon) diff --git a/deluge/transfer.py b/deluge/transfer.py index a09ad98a5..f27a65460 100644 --- a/deluge/transfer.py +++ b/deluge/transfer.py @@ -41,10 +41,11 @@ except ImportError: import zlib import struct +import logging from twisted.internet.protocol import Protocol -from deluge.log import LOG as log +log = logging.getLogger(__name__) MESSAGE_HEADER_SIZE = 5 |
