summaryrefslogtreecommitdiff
path: root/tests/unittests/helpers.py
diff options
context:
space:
mode:
authorAndrew Jorgensen <ajorgens@amazon.com>2014-12-05 14:34:10 -0800
committerScott Moser <smoser@brickies.net>2017-06-15 13:20:58 -0400
commit0fe6a0607408d387f4b0d4482b95afbc5d3f3909 (patch)
treee93fe72e4dd1b27d1331ae70c16042b8ecadc2ee /tests/unittests/helpers.py
parentb23d9d7c5c112612dbaaf8c8371c9e735500b2eb (diff)
downloadvyos-cloud-init-0fe6a0607408d387f4b0d4482b95afbc5d3f3909.tar.gz
vyos-cloud-init-0fe6a0607408d387f4b0d4482b95afbc5d3f3909.zip
write_file(s): Print permissions as octal, not decimal
Unix file modes are usually represented as octal, but they were being interpreted as decimal, for example 0o644 would be printed as '420'. Reviewed-by: Tom Kirchner <tjk@amazon.com>
Diffstat (limited to 'tests/unittests/helpers.py')
-rw-r--r--tests/unittests/helpers.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index e78abce2..569f1aef 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -97,11 +97,13 @@ class CiTestCase(TestCase):
super(CiTestCase, self).setUp()
if self.with_logs:
# Create a log handler so unit tests can search expected logs.
- logger = logging.getLogger()
+ self.logger = logging.getLogger()
self.logs = six.StringIO()
+ formatter = logging.Formatter('%(levelname)s: %(message)s')
handler = logging.StreamHandler(self.logs)
- self.old_handlers = logger.handlers
- logger.handlers = [handler]
+ handler.setFormatter(formatter)
+ self.old_handlers = self.logger.handlers
+ self.logger.handlers = [handler]
def tearDown(self):
if self.with_logs: