merge

lumin/testing/__init__.py

@@ -11,15 +11,6 @@ class MockGridOut(dict):
     def __init__(self, obj):
         self.update(obj)
 
-    def __getattr__(self, name):
-        if name in self:
-            return self[name]
-        raise AttributeError(
-            "MockGridOut has no attribute '{}'".format(name))
-
-    def read(self):
-        return self['data'].read()
-
 
 class MockGridFS:
     def __init__(self, db, collection='files'):
@@ -36,9 +27,10 @@ def delete(self, oid):
 
     def get(self, oid):
         result = doc = self.storage.get(oid, None)
+
         if doc:
-            result = MockGridOut(doc)
-        return result
+            result = doc['data']
+        return MockGridOut(result)
 
     def list(self):
         return [v['filename'] for (k, v) in self.storage.items()]

lumin/tests/test_grid_fs.py

@@ -141,18 +141,6 @@ def test_preview_url(self):
         self.assertEqual(inst.preview_url('uid'),
                          None)  # 'http://example.com/preview_image/uid')
 
-    def test___delitem__(self):
-        fp = self._make_fp()
-        cstruct = {'fp': fp,
-                   'mimetype': 'mimetype',
-                   'filename': 'filename',
-                   'uid': 'uid'}
-        inst = self.make_one()
-        inst['uid'] = cstruct
-        self.failUnless(cstruct['filename'] in inst.fs.list())
-        del inst[cstruct['uid']]
-        self.failIf(cstruct['filename'] in inst.fs.list())
-
     def test_preview_url_not_image(self):
         self.config.begin(request=self.request)
         self.config.add_route('preview_image', '/preview_image/:uid')
@@ -166,8 +154,6 @@ def test_preview_url_not_image(self):
         self.assertEqual(inst.preview_url('uid'), None)
 
 
-
-
 class TestGridFile(BaseTestCase):
 
     metadata = {'uploaded_by': 'testuser',
@@ -212,31 +198,20 @@ def test_found(self):
         self.assertEqual(result.gf.metadata, self.metadata)
         self.assertEqual(result.gf.read(), b'This is a file')
 
-    def test__acl__explicit(self):
-        fs = self._make_fs()
-        fp = self._make_file()
-        oid = fs.put(fp, content_type='text/plain',
-                     filename='aname.txt',
-                     metadata=self.metadata)
-        self.request.matchdict = {'slug': str(oid)}
-        result = self.make_one(request=self.request)
-        self.assertEqual(result.__acl__,
-            self.metadata['__acl__'])
-
-    def test_response(self):
-        from pyramid.response import Response
-        fs = self._make_fs()
-        fp = self._make_file()
-        oid = fs.put(fp, content_type=text_('text/plain'),
-                     filename='aname.txt',
-                     xmetadata=self.metadata)
-        self.request.matchdict = {'slug': str(oid)}
-        result = self.make_one(request=self.request)
-        resp = result.response()
-        self.assertTrue(isinstance(resp, Response))
-        self.assertEqual(resp.content_length, result.gf.length)
-        self.assertEqual(resp.content_type, result.gf.content_type)
-        self.assertEqual(resp.content_disposition,
-                         'attachment; filename=aname.txt')
-        self.assertEqual(resp.body, b'This is a file')
-        self.assertEqual(resp.status, '200 OK')
+# #     def test_response(self):
+# #         from pyramid.response import Response
+# #         fs = self._make_fs()
+# #         fp = self._make_file()
+# #         oid = fs.put(fp, content_type=text_('text/plain'),
+# #                      filename='aname.txt',
+# #                      xmetadata=self.metadata)
+# #         self.request.matchdict = {'slug': str(oid)}
+# #         result = self.make_one(request=self.request)
+# #         resp = result.response()
+# #         self.assertTrue(isinstance(resp, Response))
+# #         self.assertEqual(resp.content_length, result.gf.length)
+# #         self.assertEqual(resp.content_type, result.gf.content_type)
+# #         self.assertEqual(resp.content_disposition,
+# #                          'attachment; filename=aname.txt')
+# #         self.assertEqual(resp.body, b'This is a file')
+# #         self.assertEqual(resp.status, '200 OK')