From ca6f4fbe26d671a042ee1a15164106ea0e5bfc97 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@sileht.net>
Date: Fri, 6 Nov 2015 09:11:06 +0100
Subject: [PATCH] Move evaluator tests into the unit folder

The evaluator tests are not run since we split functional and unit
tests.

This change moves them into unit folder to be ran again.

Related bug: #1513738

Change-Id: Iad5018756b521c041cb25d74f1d032de6a2bf2e1
---
 aodh/tests/{ => unit}/evaluator/__init__.py         | 0
 aodh/tests/{ => unit}/evaluator/base.py             | 0
 aodh/tests/{ => unit}/evaluator/test_base.py        | 0
 aodh/tests/{ => unit}/evaluator/test_combination.py | 2 +-
 aodh/tests/{ => unit}/evaluator/test_event.py       | 2 +-
 aodh/tests/{ => unit}/evaluator/test_gnocchi.py     | 2 +-
 aodh/tests/{ => unit}/evaluator/test_threshold.py   | 2 +-
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename aodh/tests/{ => unit}/evaluator/__init__.py (100%)
 rename aodh/tests/{ => unit}/evaluator/base.py (100%)
 rename aodh/tests/{ => unit}/evaluator/test_base.py (100%)
 rename aodh/tests/{ => unit}/evaluator/test_combination.py (99%)
 rename aodh/tests/{ => unit}/evaluator/test_event.py (99%)
 rename aodh/tests/{ => unit}/evaluator/test_gnocchi.py (99%)
 rename aodh/tests/{ => unit}/evaluator/test_threshold.py (99%)

diff --git a/aodh/tests/evaluator/__init__.py b/aodh/tests/unit/evaluator/__init__.py
similarity index 100%
rename from aodh/tests/evaluator/__init__.py
rename to aodh/tests/unit/evaluator/__init__.py
diff --git a/aodh/tests/evaluator/base.py b/aodh/tests/unit/evaluator/base.py
similarity index 100%
rename from aodh/tests/evaluator/base.py
rename to aodh/tests/unit/evaluator/base.py
diff --git a/aodh/tests/evaluator/test_base.py b/aodh/tests/unit/evaluator/test_base.py
similarity index 100%
rename from aodh/tests/evaluator/test_base.py
rename to aodh/tests/unit/evaluator/test_base.py
diff --git a/aodh/tests/evaluator/test_combination.py b/aodh/tests/unit/evaluator/test_combination.py
similarity index 99%
rename from aodh/tests/evaluator/test_combination.py
rename to aodh/tests/unit/evaluator/test_combination.py
index 19d0d6c8e..4914f4a67 100644
--- a/aodh/tests/evaluator/test_combination.py
+++ b/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):
diff --git a/aodh/tests/evaluator/test_event.py b/aodh/tests/unit/evaluator/test_event.py
similarity index 99%
rename from aodh/tests/evaluator/test_event.py
rename to aodh/tests/unit/evaluator/test_event.py
index c0943cf0f..9c712f920 100644
--- a/aodh/tests/evaluator/test_event.py
+++ b/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):
diff --git a/aodh/tests/evaluator/test_gnocchi.py b/aodh/tests/unit/evaluator/test_gnocchi.py
similarity index 99%
rename from aodh/tests/evaluator/test_gnocchi.py
rename to aodh/tests/unit/evaluator/test_gnocchi.py
index 24c0dd808..13f97db94 100644
--- a/aodh/tests/evaluator/test_gnocchi.py
+++ b/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):
diff --git a/aodh/tests/evaluator/test_threshold.py b/aodh/tests/unit/evaluator/test_threshold.py
similarity index 99%
rename from aodh/tests/evaluator/test_threshold.py
rename to aodh/tests/unit/evaluator/test_threshold.py
index b4b4f0054..d71632d50 100644
--- a/aodh/tests/evaluator/test_threshold.py
+++ b/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):