Import patches-applied version 2.1.2-0ubuntu1 to applied/ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: f6e3f158c2fb9021b37654ea20839ec7a4308d52
Unapplied parent: f4e6aca60e419eafbdf11bdd631d35cf785735ae

New changelog entries:
  * New upstream release (LP: #1523715):
    - Bug fixes for Ubuntu 15.10 on Azure
    - Enablement for Azure Stack
    - Dropped patch for systemd job as upstream now includes it.

1 files changed, 9 insertions, 11 deletions

diff --git a/tests/test_logger.py b/tests/test_logger.py
index 121a8fe..20e9259 100644
--- a/tests/test_logger.py
+++ b/tests/test_logger.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2014 Microsoft Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +31,7 @@ class TestLogger(unittest.TestCase):
     def test_no_appender(self):
         #The logger won't throw exception even if no appender.
         _logger = logger.Logger()
-        _logger.verbose("Assert no exception")
+        _logger.verb("Assert no exception")
         _logger.info("Assert no exception")
         _logger.warn("Assert no exception")
         _logger.error("Assert no exception")
@@ -40,14 +41,14 @@ class TestLogger(unittest.TestCase):
         _logger.info("This is an exception {0}", Exception("Test"))
         _logger.info("This is an number {0}", 0)
         _logger.info("This is an boolean {0}", True)
-        _logger.verbose("{0}")
-        _logger.verbose("{0} {1}", 0, 1)
+        _logger.verb("{0}")
+        _logger.verb("{0} {1}", 0, 1)
         _logger.info("{0} {1}", 0, 1)
         _logger.warn("{0} {1}", 0, 1)
         _logger.error("{0} {1}", 0, 1)
-        _logger.info("this is a unicode {0}", '\u6211')
-        _logger.info("this is a utf-8 {0}", '\u6211'.encode('utf-8'))
-        _logger.info("this is a gbk {0}", 0xff )
+        _logger.add_appender(logger.AppenderType.STDOUT, 
+                             logger.LogLevel.INFO, None)
+        _logger.info(u"啊哈this is a utf-8 {0}", u'呵呵')
 
     def test_file_appender(self):
         _logger = logger.Logger()
@@ -60,12 +61,9 @@ class TestLogger(unittest.TestCase):
         self.assertTrue(tools.simple_file_grep('/tmp/testlog', msg))
 
         msg = text(uuid.uuid4())
-        _logger.verbose("Verbose should not be logged: {0}", msg)
+        _logger.verb("Verbose should not be logged: {0}", msg)
         self.assertFalse(tools.simple_file_grep('/tmp/testlog', msg))
 
-        _logger.info("this is a unicode {0}", '\u6211')
-        _logger.info("this is a utf-8 {0}", '\u6211'.encode('utf-8'))
-        _logger.info("this is a gbk {0}", 0xff)
 
     def test_concole_appender(self):
         _logger = logger.Logger()
@@ -78,7 +76,7 @@ class TestLogger(unittest.TestCase):
         self.assertTrue(tools.simple_file_grep('/tmp/testlog', msg))
 
         msg = text(uuid.uuid4())
-        _logger.verbose("Test logger: {0}", msg)
+        _logger.verb("Test logger: {0}", msg)
         self.assertFalse(tools.simple_file_grep('/tmp/testlog', msg))