add funtion for remove option images dir at the testing time

2 files changed, 12 insertions, 0 deletions

diff --git a/webapp/utils/test.py b/webapp/utils/test.py
index cd447d9..9148317 100644
--- a/webapp/utils/test.py
+++ b/webapp/utils/test.py
@@ -1,5 +1,6 @@
 import StringIO
 import Image
+import shutil
 
 from django.conf import settings
 from django.test import TestCase
@@ -57,3 +58,7 @@ def mock_in_memory_image(name='foo.jpg', format="jpeg", size=(200, 200)):
     )
     image_in_memory.seek(0)
     return image_in_memory
+
+
+def remove_option_images_dir():
+    shutil.rmtree(settings.IMAGE_OPTIONS_ROOT, ignore_errors=True)
diff --git a/webapp/webapp/features/terrain.py b/webapp/webapp/features/terrain.py
index 16eba55..632ac37 100644
--- a/webapp/webapp/features/terrain.py
+++ b/webapp/webapp/features/terrain.py
@@ -5,6 +5,8 @@ from fabric.context_managers import hide
 from django.conf import settings
 from django.core import management
 
+from utils.test import remove_option_images_dir
+
 
 @before.all
 def set_browser():
@@ -38,3 +40,8 @@ def before_each_feature(feature):
     drop_sqlite()
     if feature.name == "Researcher adds images to options":
         load_fixture("generic_researcher")
+
+
+@after.each_feature
+def after_each_feature(feature):
+    remove_option_images_dir()