From 170475e86e626f9cf3a0b0a04379b479f7763e15 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Fri, 9 Dec 2016 10:07:16 -0500 Subject: [PATCH 1/3] add more tests (#14) * add more tests * add more tests, add admin class, update gitignore --- .gitignore | 1 + dbfilestorage/admin.py | 6 ++++- tests/tests.py | 58 ++++++++++++++++++++++++------------------ 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 186729c..3cfa121 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ coverage.xml # Sphinx documentation docs/_build/ +db.sqlite3 diff --git a/dbfilestorage/admin.py b/dbfilestorage/admin.py index 53bf1f2..1eb5b96 100644 --- a/dbfilestorage/admin.py +++ b/dbfilestorage/admin.py @@ -1,4 +1,8 @@ from django.contrib import admin from .models import DBFile -admin.site.register(DBFile) + +class DBFileAdmin(admin.ModelAdmin): + list_display = ('name', 'content_type') + +admin.site.register(DBFile, DBFileAdmin) diff --git a/tests/tests.py b/tests/tests.py index 25d4cc9..e0bb9ca 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -3,10 +3,13 @@ import os from dbfilestorage.models import DBFile +from django.contrib.auth.models import User from django.core.files.storage import default_storage +from django.core.urlresolvers import reverse from django.test import TestCase, Client from django.test.utils import override_settings + PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__)) DEFAULT_FILE_STORAGE = "dbfilestorage.storage.DBFileStorage" @@ -17,6 +20,7 @@ class DBFileTest(TestCase): self.filename = "kris.jpg" self.filepath = os.path.join(PROJECT_ROOT, "test_files", self.filename) self.md5 = hashlib.md5(open(self.filepath, 'rb').read()).hexdigest() + self._upload() def _upload(self): with open(self.filepath, 'rb') as f: @@ -24,62 +28,66 @@ class DBFileTest(TestCase): def test_upload(self): """ Test that the file storage uploads and puts in DB Properly """ - name = self._upload() - self.assertEqual(name, self.md5) - self.assertTrue(DBFile.objects.filter(name=name).exists()) + self.assertTrue(DBFile.objects.filter(name=self.md5).exists()) + + def test_no_duplicate_upload(self): + """ Test that it won't make a new file if it already exists """ + # uploads once in setup already + name2 = self._upload() + self.assertEqual(self.md5, name2) def test_equality(self): """ Test that the DB entry matches what is expected from the file """ - name = self._upload() - with open(self.filepath, 'rb') as f: - dbf = DBFile.objects.get(name=name) + dbf = DBFile.objects.get(name=self.md5) self.assertEqual(dbf.b64.decode("base64"), f.read()) self.assertEqual(dbf.content_type, 'image/jpeg') def test_open(self): """ Test that the storage mechanism can upload """ - name = self._upload() - - dbf = default_storage.open(name) + dbf = default_storage.open(self.md5) with open(self.filepath, 'rb') as f: self.assertEqual(dbf.read(), f.read()) def test_exists(self): """ Test that the storage mechanism can check existance """ - name = self._upload() - - self.assertTrue(default_storage.exists(name)) + self.assertTrue(default_storage.exists(self.md5)) def test_delete(self): """ Test Deletion """ - name = self._upload() - self.assertTrue(DBFile.objects.filter(name=name).exists()) - default_storage.delete(name) - self.assertFalse(DBFile.objects.filter(name=name).exists()) + self.assertTrue(DBFile.objects.filter(name=self.md5).exists()) + default_storage.delete(self.md5) + self.assertFalse(DBFile.objects.filter(name=self.md5).exists()) def test_path(self): """ Test the path is just the md5 name """ - name = self._upload() - path = default_storage.path(name) - self.assertEqual(name, path) + path = default_storage.path(self.md5) + self.assertEqual(self.md5, path) self.assertNotIn(self.filename, path) def test_size(self): """ Ensure we can get the proper size """ - name = self._upload() - size = default_storage.size(name) + size = default_storage.size(self.md5) self.assertGreater(size, 0) def test_url(self): """ Test that the url returned is the md5 path not the filename """ - name = self._upload() - self.assertIn(self.md5, default_storage.url(name)) + self.assertIn(self.md5, default_storage.url(self.md5)) def test_view(self): client = Client() - name = self._upload() - url = default_storage.url(name) + url = default_storage.url(self.md5) resp = client.get(url) self.assertEqual(resp.status_code, 200) + + def test_admin(self): + my_admin = User.objects.create_superuser( + username='tester', + email='test@test.com', + password='top_secret') + client = Client() + client.login(username=my_admin.username, password='top_secret') + url = reverse("admin:dbfilestorage_dbfile_changelist") + resp = client.get(url) + self.assertContains(resp, self.md5) From 8c65dca6c57f47c35d96614628feb65f6750217a Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Fri, 9 Dec 2016 10:07:27 -0500 Subject: [PATCH 2/3] Add a clean command to setup (#13) --- setup.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e368c89..306cb5b 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,20 @@ except ImportError: use_setuptools() from setuptools import setup +from setuptools import setup, Command + +class CleanCommand(Command): + """Custom clean command to tidy up the project root.""" + user_options = [] + def initialize_options(self): + pass + def finalize_options(self): + pass + def run(self): + os.system('rm -vrf ./build ./dist ./*.pyc ./*.tgz ./*.egg-info') + os.system('rm -vrf htmlcov .coverage') + os.system('rm -vrf .DS_Store') + setup( name="django-dbfilestorage", version="0.1.0", @@ -41,5 +55,8 @@ setup( "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Topic :: Software Development :: Libraries :: Python Modules", - ] + ], + cmdclass={ + 'clean': CleanCommand, + } )