[yum-commits] test/test_mirror.py

[zpavlas at osuosl.org]

 test/test_mirror.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit bbcaddcd672197936fff3b3ef61b8c6cfe8680ce
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Thu Mar 7 12:39:30 2013 +0100

    Fix test cases.  BZ 918658
    
    - Make FakeGrabber compatible with MG code.
    - Reset host stats when test code expects 'bad' mirrors
      to be tried first.

diff --git a/test/test_mirror.py b/test/test_mirror.py
index 70fe069..cb63a41 100644
--- a/test/test_mirror.py
+++ b/test/test_mirror.py
@@ -28,7 +28,7 @@ import os
 import string, tempfile, random, cStringIO, os
 
 import urlgrabber.grabber
-from urlgrabber.grabber import URLGrabber, URLGrabError
+from urlgrabber.grabber import URLGrabber, URLGrabError, URLGrabberOptions
 import urlgrabber.mirror
 from urlgrabber.mirror import MirrorGroup, MGRandomStart, MGRandomOrder
 
@@ -106,6 +106,9 @@ class CallbackTests(TestCase):
         self.g  = URLGrabber()
         fullmirrors = [base_mirror_url + m + '/' for m in \
                        (bad_mirrors + good_mirrors)]
+        if hasattr(urlgrabber.grabber, '_TH'):
+            # test assumes mirrors are not re-ordered
+            urlgrabber.grabber._TH.hosts.clear()
         self.mg = MirrorGroup(self.g, fullmirrors)
     
     def test_failure_callback(self):
@@ -168,6 +171,7 @@ class FakeGrabber:
         self.resultlist = resultlist or []
         self.index = 0
         self.calls = []
+        self.opts = URLGrabberOptions()
         
     def urlgrab(self, url, filename=None, **kwargs):
         self.calls.append( (url, filename) )