Merge pull request #54 from SemmLille/ptitloup/bugfix-es_test_install

Ptitloup/bugfix es test install

pod_project/core/tests/test_install.py

@@ -135,10 +135,10 @@ def setUp(self):
         print "EsTestView"
 
     def test_es(self):
-        es_url = settings.HAYSTACK_CONNECTIONS['default']['URL']
+        es_url = getattr(settings, 'ES_URL', ['http://127.0.0.1:9200/'])
         print "> Elastic search url : %s " % es_url
         http = urllib3.PoolManager()
-        r = http.request('GET', es_url)
+        r = http.request('GET', es_url[0])
         self.assertEqual(r.status, 200)
         print "\n   --->  test_es of EsTestView : OK ! \n info : \n %s \n" % r.data
 
@@ -157,20 +157,29 @@ class EncodingFileTestView(TestCase):
     def setUp(self):
         remi = User.objects.create(username="remi")
         other_type = Type.objects.get(id=1)
-        url = "http://pod.univ-lille1.fr/media/pod.mp4"
-        tempfile = NamedTemporaryFile(delete=True)
-        HTTP_PROXY=getattr(settings, 'HTTP_PROXY', None)
-        if HTTP_PROXY:
-            proxy = urllib3.ProxyManager(settings.HTTP_PROXY)
-            with proxy.request('GET', url, preload_content=False) as r, open(tempfile.name, 'wb') as out_file:
-                shutil.copyfileobj(r, out_file)
-        else:
-            http = urllib3.PoolManager()
-            with http.request('GET', url, preload_content=False) as r, open(tempfile.name, 'wb') as out_file:
-                shutil.copyfileobj(r, out_file)
-        pod = Pod.objects.create(
-            type=other_type, title="Video", owner=remi, video="-", to_encode=False)
-        pod.video.save("test.mp4", File(tempfile))
+        file_path = os.path.join(settings.MEDIA_ROOT, 'videos', remi.username, 'test.mp4')
+        if not os.path.exists(file_path):
+            url = "http://pod.univ-lille1.fr/media/pod.mp4"
+            print "Download video file from %s" %url
+            tempfile = NamedTemporaryFile(delete=True)
+            HTTP_PROXY=getattr(settings, 'HTTP_PROXY', None)
+            if HTTP_PROXY:
+                proxy = urllib3.ProxyManager(settings.HTTP_PROXY)
+                with proxy.request('GET', url, preload_content=False) as r, open(tempfile.name, 'wb') as out_file:
+                    shutil.copyfileobj(r, out_file)
+            else:
+                http = urllib3.PoolManager()
+                with http.request('GET', url, preload_content=False) as r, open(tempfile.name, 'wb') as out_file:
+                    shutil.copyfileobj(r, out_file)
+            pod = Pod.objects.create(
+                type=other_type, title="Video", owner=remi, video="-", to_encode=False)
+            pod.video.save("test.mp4", File(tempfile))
+        else :
+            print "File already exist"
+            pod = Pod.objects.create(
+                type=other_type, title="Video", owner=remi, video="-", to_encode=False)
+            pod.video.name = os.path.join('videos', remi.username, 'test.mp4')
+            pod.save()
         print "\n --->  SetUp of EncodingFileTestView : OK !"
 
     def test_encoding(self):

pod_project/pod_project/settings-sample.py

@@ -45,6 +45,7 @@
     'taggit',
     'taggit_templatetags',
     'jquery',
+    'djangoformsetjs',
     'captcha',
     'bootstrap3',
     # Applications locales

pod_project/pods/tests/tests_models.py

@@ -757,11 +757,14 @@ class ReportVideoTestCase(TestCase):
 
     def setUp(self):
         remi = User.objects.create_user("Remi")
+        nicolas = User.objects.create_user("Nicolas")
         other_type = Type.objects.get(id=1)
         pod = Pod.objects.create(
             type=other_type,  title="Video1", slug="tralala", owner=remi)
+
         ReportVideo.objects.create(video=pod, user=remi)
-        ReportVideo.objects.create(video=pod, user=remi, comment="violation des droits", answer="accepte")
+
+        ReportVideo.objects.create(video=pod, user=nicolas, comment="violation des droits", answer="accepte")
 
 
         print (" --->  SetUp of ReportVideoTestCase : OK !")
@@ -797,7 +800,7 @@ def test_attributs_with_comment(self):
         self.assertEqual(reportVideo.video.id, 1)
         self.assertEqual(reportVideo.__unicode__(), "%s - %s" %
                          (reportVideo.video, reportVideo.user))
-        self.assertEqual(reportVideo.user.username, "Remi")
+        self.assertEqual(reportVideo.user.username, "Nicolas")
         date = datetime.today()
         self.assertEqual(reportVideo.date_added.year, date.year)
         self.assertEqual(reportVideo.date_added.month, date.month)

requirements.txt

@@ -3,6 +3,7 @@ django-bootstrap3==3.2.1
 django-ckeditor-updated==4.4.4
 django-extensions==1.3.3
 django-filer==0.9.10
+django-formset-js==0.4.0
 django-jquery-js==2.1.4
 django-modeltranslation==0.8
 django-mptt==0.6.1