Changeset 1888

Timestamp:

11/14/08 15:20:01 (8 weeks ago)

Author:

slinkp

Message:

ADDED mocks of the flickr API using minimock, this fixes recent test failures and avoids hitting flickr during test runs

Location:

siteapp/trunk/opengeo/almanac

Files:

• ftests.py (modified) (2 diffs)
• rest.txt (modified) (1 diff)
• testing.py (modified) (3 diffs)

siteapp/trunk/opengeo/almanac/ftests.py

@@ -7 +7 @@
 def test_suite():
     """
-    These are my tests
+    Functional tests using 
     """
     from opengeo.almanac import testing
@@ -25 +25 @@
     data2 = testing.fresh_story_data()
     content_setup = testing.setup_basic_content_fixture
-    import pdb 
+    import pdb
+    real_settrace = pdb.set_trace  # zope.testbrowser does something evil 
     globs = testing.fresh_ftest_globs()
     new_request = testing.new_request

siteapp/trunk/opengeo/almanac/rest.txt

@@ -96 +96 @@
     >>> url = "http://localhost/++rest++app/our-app/a1"
     >>> response = http_call('GET', url + "?lineno=58")
+    Called FlickrAPI.photos_getInfo(photo_id='1234')
+
     >>> print response.getBody()  
     <atom:feed xmlns:atom="http://www.w3.org/2005/Atom">

siteapp/trunk/opengeo/almanac/testing.py

@@ -2 +2 @@
 from grok.ftests.test_grok_functional import checker
 from opengeo.almanac import REQUIREMENT as req
-from opengeo.almanac import validata, content, utils
+from opengeo.almanac import validata, content
 from opengeo.testing.suite import TestCollector, DTSuiteFactory
 from pprint import pprint
@@ -13 +13 @@
 from zope.testing import doctest
 import base64, urllib
+import minimock
 import pkg_resources
-from decorator import decorator
 import zope.component.eventtesting
 
@@ -56 +56 @@
         if self.setup is None:
             self.setup = FunctionalTestSetup(self.config_file)
-        
+
+_mock_restore = {}
+
+def mock_get_flicker_api():
+    api = minimock.Mock('FlickrAPI')
+    class Bunch:
+        # A generic dummy container for attributes.
+        def __init__(self, **kw):
+            for name, val in kw.items():
+                setattr(self, name, val)
+
+    MockPhoto = Bunch(attrib={'stat': u'ok'},
+                      photo=[{'farm': 'mock farmid', 'server': 'mock server',
+                              'secret': 'mock secret'}])
+    api.photos_getInfo.mock_returns = MockPhoto
+    
+    MockUploadResult = Bunch(attrib={'stat': u'ok'},
+                             photoid=[Bunch(text='mock photo id')])
+    api.upload.mock_returns = MockUploadResult
+
+    api.photos_licenses_setLicense.mock_returns = Bunch(attrib={'stat': u'ok'})
+    return api
+
 def f_setUp(test=None):
     if ZCMLayer.setup is None:
         ZCMLayer.setup = FunctionalTestSetup(ftesting_zcml)
     ZCMLayer.setup.setUp()
+    from opengeo.almanac import content
+    if not content.get_flickrapi_object is mock_get_flicker_api:
+        _mock_restore['get_flickrapi_object'] = content.get_flickrapi_object
+        content.get_flickrapi_object = mock_get_flicker_api
 
 def f_tearDown(test):
+    # we could probably just call minimock
+    old_flickrapi = _mock_restore.get('get_flickrapi_object')
+    if old_flickrapi is not None:
+        from opengeo.almanac import content
+        content.get_flickrapi_object = old_flickrapi
     ZCMLayer.setup.tearDown()