Merge branch 'master' into nef

1 files changed, 15 insertions, 2 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index fb48205..070443e 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -77,7 +77,15 @@ def subcategory_setup():
                         icon=icon,
                         order=1,
                         item_type='M',)
-    return [subcategory_1, subcategory_2, subcategory_3, subcategory_4]
+
+    subcategory_5 = SubCategory.objects.create(category=category,
+                        name='Subcategory 5',
+                        available=True,
+                        icon=icon,
+                        order=1,
+                        item_type='M',)
+    return [subcategory_1, subcategory_2, subcategory_3, subcategory_4,
+            subcategory_5]
 
 def marker_setup(sub_categories=[]):
     if not sub_categories:
@@ -193,8 +201,13 @@ class KMLImporterTest(TestCase, ImporterTest):
          default_description="Default description")
         importer4.categories.add(subcategories[3])
 
+        importer5 = Importer.objects.create(importer_type='KML',
+         source=test_dir_path+'tests/sample-no-folder.kml', zipped=False,
+         default_description="Default description")
+        importer5.categories.add(subcategories[4])
+
         self.marker_importers = [(importer1, 1), (importer2, 3), (importer3, 0),
-                                 (importer4, 4)]
+                                 (importer4, 4), (importer5, 3)]
 
     def test_defaultdescription(self):
         Marker.objects.all().delete()