From 6aac2613c4907ab512d97259678315d05f2d0a4a Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Wed, 25 Oct 2017 14:47:13 +0200
Subject: [PATCH] Move binary and notification tests in unit

Those tests are nothing to do with the functional testing done with storage
drivers. They can be done at unit test time.

Change-Id: Id176175fbbe814bb03ae9e9ca6ac6a7e1149c290
---
 ceilometer/tests/{functional => unit}/test_bin.py          | 5 ++---
 ceilometer/tests/{functional => unit}/test_notification.py | 0
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename ceilometer/tests/{functional => unit}/test_bin.py (97%)
 rename ceilometer/tests/{functional => unit}/test_notification.py (100%)

diff --git a/ceilometer/tests/functional/test_bin.py b/ceilometer/tests/unit/test_bin.py
similarity index 97%
rename from ceilometer/tests/functional/test_bin.py
rename to ceilometer/tests/unit/test_bin.py
index 1cd4b165ea..712c7c30b6 100644
--- a/ceilometer/tests/functional/test_bin.py
+++ b/ceilometer/tests/unit/test_bin.py
@@ -167,6 +167,5 @@ class BinCeilometerPollingServiceTestCase(base.BaseTestCase):
             ["ceilometer-polling", "--config-file=%s" % self.tempfile],
             stderr=subprocess.PIPE)
         __, err = self.subp.communicate()
-        expected = ("Exception: Valid values are ['compute', 'central', "
-                    "'ipmi'], but found [\"['central']\"]")
-        self.assertIn(expected, err)
+        self.assertIn(b"Exception: Valid values are ['compute', 'central', "
+                      b"'ipmi'], but found [\"['central']\"]", err)
diff --git a/ceilometer/tests/functional/test_notification.py b/ceilometer/tests/unit/test_notification.py
similarity index 100%
rename from ceilometer/tests/functional/test_notification.py
rename to ceilometer/tests/unit/test_notification.py