Merge branch 'release-0.14' into debian-release-0.14

[snf-cloudcms] / cloudcms / tests / __init__.py

diff --git a/cloudcms/tests/__init__.py b/cloudcms/tests/__init__.py
index b0b4a1f..8c938fa 100644 (file)
--- a/cloudcms/tests/__init__.py
+++ b/cloudcms/tests/__init__.py
@@ -35,24 +35,18 @@
 import os
 import tempfile
 
-from django.test import TestCase, TransactionTestCase
+from django.test import TransactionTestCase
 from django.contrib.auth.models import User
 from django.core.files.uploadedfile import SimpleUploadedFile
 
-from feincms.module.medialibrary.models import Category as MediaCategory, \
-        MediaFile
+from feincms.module.medialibrary.models import MediaFile
 
 from cloudcmsguide.models import UserGuideEntry
-from cloudcmsfaq.models import Category, Question
-from cloudcms.rstutils import generate_rst_contents_from_dir
-from cloudcms.models import Service, ServiceTranslation
+from cloudcmsfaq.models import Question
 from cloudcms.forms import RstZipImportForm
 
-from synnefo.lib.log import initialize_logging
-
 from django.conf import settings
 
-initialize_logging()
 
 TESTS_BASE = os.path.abspath(os.path.dirname(__file__))
 
@@ -65,20 +59,23 @@ TEST_VALID_ZIP = os.path.join(TESTS_BASE, 'userdocs1.zip')
 
 settings.MEDIA_ROOT = tempfile.mkdtemp("cms-tests")
 
+
 class TestSphinxImport(TransactionTestCase):
 
     fixtures = ['cloudcms_media_categories', 'cloudcms_default_services']
 
     def setUp(self):
-        c = Category.objects.create()
-        self.user = User.objects.create(username="admin", email="admin@admin.com")
+        self.user = User.objects.create(username="admin",
+                                        email="admin@admin.com")
         self.user.is_superuser = True
         self.user.set_password("test")
         self.user.save()
 
     def test_from_dir1(self):
         zipfile = SimpleUploadedFile('file.zip', file(TEST_VALID_ZIP).read())
-        form = RstZipImportForm({'import_categories': ['faqs', 'guide']}, files={'import_file': zipfile})
+        form = RstZipImportForm({
+            'import_categories': ['faqs', 'guide']
+        }, files={'import_file': zipfile})
         form.is_valid()
         success, log = form.save(self.user, TEST_DIR1)
 
@@ -89,15 +86,18 @@ class TestSphinxImport(TransactionTestCase):
 
     def test_form(self):
         zipfile = SimpleUploadedFile('file.zip', file(TEST_INVALID_ZIP).read())
-        form = RstZipImportForm({'import_categories': ['faqs', 'guide']}, files={'import_file': zipfile})
+        form = RstZipImportForm({
+            'import_categories': ['faqs', 'guide']},
+            files={'import_file': zipfile})
         self.assertEqual(form.is_valid(), False)
 
         zipfile = SimpleUploadedFile('file.zip', file(TEST_VALID_ZIP).read())
-        form = RstZipImportForm({'import_categories': ['faqs', 'guide']}, files={'import_file': zipfile})
+        form = RstZipImportForm({
+            'import_categories': ['faqs', 'guide']},
+            files={'import_file': zipfile})
         self.assertEqual(form.is_valid(), True)
 
         form.save(self.user)
-        self.assertEqual(MediaFile.objects.all().count(), 5)
+        self.assertEqual(MediaFile.objects.all().count(), 3)
         self.assertEqual(Question.objects.all().count(), 4)
         self.assertEqual(UserGuideEntry.objects.all().count(), 3)
-