Fixing up tests after merge conflicts

ckan · Jan 20, 2012 · cbf2243 · cbf2243
1 parent 6e01ee5
commit cbf2243
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ckan/lib/dictization/model_dictize.py b/ckan/lib/dictization/model_dictize.py
@@ -192,7 +192,7 @@ def package_dictize(pkg, context):
     result_dict['isopen'] = pkg.isopen if isinstance(pkg.isopen,bool) else pkg.isopen()
 
     # type
-    result_dict['type']= pkg_object.type
+    result_dict['type']= pkg.type
 
     # creation and modification date
     result_dict['metadata_modified'] = pkg.metadata_modified.isoformat() \

diff --git a/ckan/tests/lib/test_dictization_schema.py b/ckan/tests/lib/test_dictization_schema.py
@@ -141,6 +141,7 @@ def test_2_group_schema(self):
         expected = {'description': u'These are books that David likes.',
                                  'id': group.id,
                                  'name': u'david',
+                                 'type': u'group',
                                  'packages': sorted([{'id': group_pack[0].id},
                                               {'id': group_pack[1].id,
                                                }], key=lambda x:x["id"]),