From 367abe4c5091b679c896d853641174685e650475 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Mon, 25 Apr 2016 12:13:40 +0200
Subject: [PATCH] [tests] Use tearDownModule from common to erase test_prefix
directory after the end of tests
---
beat/web/algorithms/tests/core.py | 7 +++----
beat/web/algorithms/tests/tests.py | 3 ++-
beat/web/algorithms/tests/tests_api.py | 3 ++-
beat/web/algorithms/tests/tests_team.py | 5 +++--
beat/web/algorithms/tests/tests_user.py | 1 +
beat/web/attestations/tests.py | 2 +-
beat/web/backend/tests.py | 9 +--------
beat/web/common/testutils.py | 16 ++++++++--------
beat/web/dataformats/tests/core.py | 4 ++--
beat/web/dataformats/tests/tests.py | 2 ++
beat/web/dataformats/tests/tests_api.py | 1 +
beat/web/dataformats/tests/tests_user.py | 1 +
beat/web/experiments/tests.py | 2 +-
beat/web/libraries/tests/core.py | 6 +++---
beat/web/libraries/tests/tests_api.py | 2 ++
beat/web/libraries/tests/tests_team.py | 3 ++-
beat/web/libraries/tests/tests_user.py | 2 ++
beat/web/reports/tests.py | 1 +
beat/web/team/tests.py | 3 ++-
beat/web/toolchains/tests.py | 2 +-
20 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/beat/web/algorithms/tests/core.py b/beat/web/algorithms/tests/core.py
index 151fa20a9..2f3c375bb 100644
--- a/beat/web/algorithms/tests/core.py
+++ b/beat/web/algorithms/tests/core.py
@@ -34,10 +34,9 @@ import simplejson as json
from django.contrib.auth.models import User
from django.conf import settings
-from beat.web.dataformats.models import DataFormat
-
-from beat.web.common.testutils import BaseTestCase
-from beat.web.team.models import Team
+from ...dataformats.models import DataFormat
+from ...common.testutils import BaseTestCase, tearDownModule
+from ...team.models import Team
from ..models import Algorithm
diff --git a/beat/web/algorithms/tests/tests.py b/beat/web/algorithms/tests/tests.py
index 634e2ef8a..3b0edf3cb 100644
--- a/beat/web/algorithms/tests/tests.py
+++ b/beat/web/algorithms/tests/tests.py
@@ -27,7 +27,8 @@
from django.contrib.auth.models import User
-from beat.web.libraries.models import Library
+from ...libraries.models import Library
+from ...common.testutils import tearDownModule
from ..models import Algorithm
diff --git a/beat/web/algorithms/tests/tests_api.py b/beat/web/algorithms/tests/tests_api.py
index ceccce34e..749fd77b8 100644
--- a/beat/web/algorithms/tests/tests_api.py
+++ b/beat/web/algorithms/tests/tests_api.py
@@ -32,7 +32,8 @@ from django.contrib.auth.models import User
from django.conf import settings
from django.core.urlresolvers import reverse
-from beat.web.dataformats.models import DataFormat
+from ...dataformats.models import DataFormat
+from ...common.testutils import tearDownModule
import beat.core.algorithm
diff --git a/beat/web/algorithms/tests/tests_team.py b/beat/web/algorithms/tests/tests_team.py
index 68ef3b716..173946850 100644
--- a/beat/web/algorithms/tests/tests_team.py
+++ b/beat/web/algorithms/tests/tests_team.py
@@ -27,8 +27,9 @@
from django.contrib.auth.models import User
-from beat.web.team.models import Team
-from beat.web.dataformats.models import DataFormat
+from ...team.models import Team
+from ...dataformats.models import DataFormat
+from ...common.testutils import tearDownModule
from ..models import Algorithm
diff --git a/beat/web/algorithms/tests/tests_user.py b/beat/web/algorithms/tests/tests_user.py
index 71114d37e..5c02aef9b 100644
--- a/beat/web/algorithms/tests/tests_user.py
+++ b/beat/web/algorithms/tests/tests_user.py
@@ -29,6 +29,7 @@
from ..models import Algorithm
from .core import AlgorithmsAccessibilityFunctionsBase
+from ...common.testutils import tearDownModule
class NotSharedAlgorithm_CheckAccessibilityFunction(AlgorithmsAccessibilityFunctionsBase):
diff --git a/beat/web/attestations/tests.py b/beat/web/attestations/tests.py
index 58ac0e9db..d2ea57a1c 100644
--- a/beat/web/attestations/tests.py
+++ b/beat/web/attestations/tests.py
@@ -46,7 +46,7 @@ from ..dataformats.models import DataFormat
from ..toolchains.models import Toolchain
from ..databases.models import Database
-from ..common.testutils import BaseTestCase
+from ..common.testutils import BaseTestCase, tearDownModule
class AttestationsAPIBase(BaseTestCase):
diff --git a/beat/web/backend/tests.py b/beat/web/backend/tests.py
index 57ae426e8..e2d712afc 100644
--- a/beat/web/backend/tests.py
+++ b/beat/web/backend/tests.py
@@ -40,7 +40,7 @@ from django.test import TestCase
from guardian.shortcuts import get_perms
-from ..common.testutils import BaseTestCase as APITestCase
+from ..common.testutils import BaseTestCase as APITestCase, tearDownModule
from ..experiments.models import Experiment, Block
from ..algorithms.models import Algorithm
from ..utils.management.commands import install
@@ -234,13 +234,6 @@ PRIORITY_QUEUES = {
}
-def tearDownModule():
- if os.path.exists(settings.CACHE_ROOT):
- shutil.rmtree(settings.CACHE_ROOT)
- if os.path.exists(settings.PREFIX):
- shutil.rmtree(settings.PREFIX)
-
-
class CancelAllExperimentsAPI(APITestCase):
def setUp(self):
diff --git a/beat/web/common/testutils.py b/beat/web/common/testutils.py
index dec0abe87..5b9553691 100644
--- a/beat/web/common/testutils.py
+++ b/beat/web/common/testutils.py
@@ -38,17 +38,17 @@ import simplejson as json
from .models import Shareable
-class BaseTestCase(TestCase):
- class Meta:
- model = None
+def tearDownModule():
+ if os.path.exists(settings.CACHE_ROOT):
+ shutil.rmtree(settings.CACHE_ROOT)
+ if os.path.exists(settings.PREFIX):
+ shutil.rmtree(settings.PREFIX)
- def tearDown(self):
- if os.path.exists(settings.CACHE_ROOT):
- shutil.rmtree(settings.CACHE_ROOT)
- if os.path.exists(settings.PREFIX):
- shutil.rmtree(settings.PREFIX)
+class BaseTestCase(TestCase):
+ class Meta:
+ model = None
def checkObjectDBSharingPreferences(self, contribution, reference):
diff --git a/beat/web/dataformats/tests/core.py b/beat/web/dataformats/tests/core.py
index 53aaf270c..50e7b99fb 100644
--- a/beat/web/dataformats/tests/core.py
+++ b/beat/web/dataformats/tests/core.py
@@ -35,8 +35,8 @@ from django.contrib.auth.models import User
from ..models import DataFormat
-from beat.web.team.models import Team
-from beat.web.common.testutils import BaseTestCase
+from ...team.models import Team
+from ...common.testutils import BaseTestCase, tearDownModule
class DataFormatsAccessibilityFunctionsBase(BaseTestCase):
diff --git a/beat/web/dataformats/tests/tests.py b/beat/web/dataformats/tests/tests.py
index 226d450d1..ab4a68e5d 100644
--- a/beat/web/dataformats/tests/tests.py
+++ b/beat/web/dataformats/tests/tests.py
@@ -33,6 +33,8 @@ from django.test import TestCase
from django.conf import settings
from django.contrib.auth.models import User
+from ...common.testutils import tearDownModule
+
from beat.core.dataformat import Storage, DataFormat as CoreDataFormat
from ..models import DataFormat
diff --git a/beat/web/dataformats/tests/tests_api.py b/beat/web/dataformats/tests/tests_api.py
index bb2e929d1..7f35c3705 100644
--- a/beat/web/dataformats/tests/tests_api.py
+++ b/beat/web/dataformats/tests/tests_api.py
@@ -32,6 +32,7 @@ from django.contrib.auth.models import User
from django.conf import settings
from django.core.urlresolvers import reverse
+from ...common.testutils import tearDownModule
from ..models import DataFormat
from core import DataFormatsAPIBase, DataFormatSharingAPIBase
diff --git a/beat/web/dataformats/tests/tests_user.py b/beat/web/dataformats/tests/tests_user.py
index a667ced99..c784dc6ed 100644
--- a/beat/web/dataformats/tests/tests_user.py
+++ b/beat/web/dataformats/tests/tests_user.py
@@ -28,6 +28,7 @@
from core import DataFormatsAccessibilityFunctionsBase
+from ...common.testutils import tearDownModule
from ..models import DataFormat
class NotSharedDataFormat_CheckAccessibilityFunction(DataFormatsAccessibilityFunctionsBase):
diff --git a/beat/web/experiments/tests.py b/beat/web/experiments/tests.py
index ba2763b9b..23107adf2 100644
--- a/beat/web/experiments/tests.py
+++ b/beat/web/experiments/tests.py
@@ -50,7 +50,7 @@ from ..backend.models import Queue
from ..attestations.models import Attestation
from ..databases.models import Database
-from ..common.testutils import BaseTestCase
+from ..common.testutils import BaseTestCase, tearDownModule
HASHES = {
'addition1': 'ff59a471cec5c17b45d1dfa5aff3ed897ee2d7ed87de205365b372be1c726c87',
diff --git a/beat/web/libraries/tests/core.py b/beat/web/libraries/tests/core.py
index df17669db..31567388c 100644
--- a/beat/web/libraries/tests/core.py
+++ b/beat/web/libraries/tests/core.py
@@ -34,10 +34,10 @@ import simplejson as json
from django.contrib.auth.models import User
from django.conf import settings
-from beat.web.dataformats.models import DataFormat
+from ...dataformats.models import DataFormat
-from beat.web.common.testutils import BaseTestCase
-from beat.web.team.models import Team
+from ...common.testutils import BaseTestCase, tearDownModule
+from ...team.models import Team
from ..models import Library
diff --git a/beat/web/libraries/tests/tests_api.py b/beat/web/libraries/tests/tests_api.py
index 7ce42f90b..f673ddb0e 100644
--- a/beat/web/libraries/tests/tests_api.py
+++ b/beat/web/libraries/tests/tests_api.py
@@ -34,6 +34,8 @@ from django.core.urlresolvers import reverse
import beat.core.library
+from ...common.testutils import tearDownModule
+
from ..models import Library
from .core import LibrariesAPIBase
diff --git a/beat/web/libraries/tests/tests_team.py b/beat/web/libraries/tests/tests_team.py
index 8e4f25e7b..ac3d89a0b 100644
--- a/beat/web/libraries/tests/tests_team.py
+++ b/beat/web/libraries/tests/tests_team.py
@@ -27,7 +27,8 @@
from django.contrib.auth.models import User
-from beat.web.team.models import Team
+from ...common.testutils import tearDownModule
+from ...team.models import Team
from ..models import Library
diff --git a/beat/web/libraries/tests/tests_user.py b/beat/web/libraries/tests/tests_user.py
index ccd48e360..22fdc09e1 100644
--- a/beat/web/libraries/tests/tests_user.py
+++ b/beat/web/libraries/tests/tests_user.py
@@ -26,6 +26,8 @@
###############################################################################
+from ...common.testutils import tearDownModule
+
from ..models import Library
from .core import LibrariesAccessibilityFunctionsBase
diff --git a/beat/web/reports/tests.py b/beat/web/reports/tests.py
index 8ae7c313a..e9edac72e 100644
--- a/beat/web/reports/tests.py
+++ b/beat/web/reports/tests.py
@@ -47,6 +47,7 @@ from ..plotters.models import Plotter
from ..plotters.models import PlotterParameter
from ..common.models import Shareable
+from ..common.testutils import tearDownModule
from ..backend.models import Environment
from ..backend.models import Queue
diff --git a/beat/web/team/tests.py b/beat/web/team/tests.py
index fc3351e60..078d3fd4d 100644
--- a/beat/web/team/tests.py
+++ b/beat/web/team/tests.py
@@ -34,6 +34,7 @@ from django.contrib.auth.models import User
import simplejson as json
+from ..common.testutils import tearDownModule
from .models import Team
from .serializers import SimpleTeamSerializer
@@ -221,8 +222,8 @@ class TeamAddMemberTestCase(TeamTestCase):
'is_owner': True,
'accessibility': 'public',
'members': [
- self.johndoe.username,
self.jackdoe.username,
+ self.johndoe.username,
]
}
diff --git a/beat/web/toolchains/tests.py b/beat/web/toolchains/tests.py
index 74bc3eda6..b78bd7a36 100644
--- a/beat/web/toolchains/tests.py
+++ b/beat/web/toolchains/tests.py
@@ -40,7 +40,7 @@ import beat.core.toolchain
from .models import Toolchain
from ..common.models import Shareable
-from ..common.testutils import BaseTestCase
+from ..common.testutils import BaseTestCase, tearDownModule
--
GitLab