Fix test suite

Author: codingjoe

s3file/apps.py

@@ -8,11 +8,16 @@ class S3FileConfig(AppConfig):
     def ready(self):
         from django.core.files.storage import default_storage
         from storages.backends.s3boto3 import S3Boto3Storage
+        from django import forms
+        from .forms import S3FileInputMixin
 
-        if isinstance(default_storage, S3Boto3Storage):
-            from django import forms
-            from .forms import S3FileInputMixin
+        if isinstance(default_storage, S3Boto3Storage) and \
+                S3FileInputMixin not in forms.ClearableFileInput.__bases__:
+            forms.ClearableFileInput.__bases__ = \
+                (S3FileInputMixin,) + forms.ClearableFileInput.__bases__
 
-            if S3FileInputMixin not in forms.ClearableFileInput.__bases__:
-                forms.ClearableFileInput.__bases__ = \
-                    (S3FileInputMixin,) + forms.ClearableFileInput.__bases__
+        elif S3FileInputMixin in forms.ClearableFileInput.__bases__:
+            forms.ClearableFileInput.__bases__ = tuple(
+                cls for cls in forms.ClearableFileInput.__bases__
+                if cls is not S3FileInputMixin
+            )

tests/conftest.py

@@ -11,8 +11,7 @@
 @pytest.yield_fixture(scope='session')
 def driver():
     chrome_options = webdriver.ChromeOptions()
-    chrome_options.add_argument('headless')
-    chrome_options.add_argument('window-size=1200x800')
+    chrome_options.headless = True
     try:
         b = webdriver.Chrome(options=chrome_options)
     except WebDriverException as e: