Merge "Move evaluator tests into the unit folder"

aodh/tests/unit/evaluator/test_combination.py

@@ -30,7 +30,7 @@ import pytz
 from aodh.evaluator import combination
 from aodh.storage import models
 from aodh.tests import constants
-from aodh.tests.evaluator import base
+from aodh.tests.unit.evaluator import base
 
 
 class TestEvaluate(base.TestEvaluatorBase):

aodh/tests/unit/evaluator/test_event.py

@@ -25,7 +25,7 @@ from aodh import evaluator
 from aodh.evaluator import event as event_evaluator
 from aodh.storage import models
 from aodh.tests import constants
-from aodh.tests.evaluator import base
+from aodh.tests.unit.evaluator import base
 
 
 class TestEventAlarmEvaluate(base.TestEvaluatorBase):

aodh/tests/unit/evaluator/test_gnocchi.py

@@ -28,7 +28,7 @@ from six import moves
 from aodh.evaluator import gnocchi
 from aodh.storage import models
 from aodh.tests import constants
-from aodh.tests.evaluator import base
+from aodh.tests.unit.evaluator import base
 
 
 class FakeResponse(object):

aodh/tests/unit/evaluator/test_threshold.py

@@ -30,7 +30,7 @@ from aodh.evaluator import threshold
 from aodh import messaging
 from aodh.storage import models
 from aodh.tests import constants
-from aodh.tests.evaluator import base
+from aodh.tests.unit.evaluator import base
 
 
 class TestEvaluate(base.TestEvaluatorBase):