Merge "Move binary and notification tests in unit"

2017-10-26 04:11:17 +00:00 · 2017-10-26 04:11:17 +00:00 · 22138b5988
commit 22138b5988
parent a1eacadaea 6aac2613c4
2 changed files with 2 additions and 3 deletions
--- a/ceilometer/tests/functional/test_bin.py
+++ b/ceilometer/tests/functional/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)
--- a/ceilometer/tests/functional/test_notification.py
+++ b/ceilometer/tests/functional/test_notification.py