1
diff --git a/cloudinit/config/cc_write_files.py b/cloudinit/config/cc_write_files.py
2
index 72e1cdd..1835a31 100644
3
--- a/cloudinit/config/cc_write_files.py
4
+++ b/cloudinit/config/cc_write_files.py
5
@@ -53,6 +53,7 @@ import six
6
53
from cloudinit.settings import PER_INSTANCE
53
from cloudinit.settings import PER_INSTANCE
7
54
from cloudinit import util
54
from cloudinit import util
8
55
55
9
56
10
56
frequency = PER_INSTANCE
57
frequency = PER_INSTANCE
11
57
58
12
58
DEFAULT_OWNER = "root:root"
59
DEFAULT_OWNER = "root:root"
13
@@ -119,7 +120,14 @@ def decode_perms(perm, default, log):
14
119
            # Force to string and try octal conversion
120
            # Force to string and try octal conversion
15
120
            return int(str(perm), 8)
121
            return int(str(perm), 8)
16
121
    except (TypeError, ValueError):
122
    except (TypeError, ValueError):
18
122
        log.warn("Undecodable permissions %s, assuming %s", perm, default)
123
        reps = []
19
124
        for r in (perm, default):
20
125
            try:
21
126
                reps.append("%o" % r)
22
127
            except TypeError:
23
128
                reps.append("%r" % r)
24
129
        log.warning(
25
130
            "Undecodable permissions {0}, returning default {1}".format(*reps))
26
123
        return default
131
        return default
27
124
132
28
125
133
29
diff --git a/cloudinit/util.py b/cloudinit/util.py
30
index 415ca37..ec68925 100644
31
--- a/cloudinit/util.py
32
+++ b/cloudinit/util.py
33
@@ -1751,8 +1751,12 @@ def write_file(filename, content, mode=0o644, omode="wb", copy_mode=False):
34
1751
    else:
1751
    else:
35
1752
        content = decode_binary(content)
1752
        content = decode_binary(content)
36
1753
        write_type = 'characters'
1753
        write_type = 'characters'
37
1754
    try:
38
1755
        mode_r = "%o" % mode
39
1756
    except TypeError:
40
1757
        mode_r = "%r" % mode
41
1754
    LOG.debug("Writing to %s - %s: [%s] %s %s",
1758
    LOG.debug("Writing to %s - %s: [%s] %s %s",
43
1755
              filename, omode, mode, len(content), write_type)
1759
              filename, omode, mode_r, len(content), write_type)
44
1756
    with SeLinuxGuard(path=filename):
1760
    with SeLinuxGuard(path=filename):
45
1757
        with open(filename, omode) as fh:
1761
        with open(filename, omode) as fh:
46
1758
            fh.write(content)
1762
            fh.write(content)
47
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
48
index e78abce..569f1ae 100644
49
--- a/tests/unittests/helpers.py
50
+++ b/tests/unittests/helpers.py
51
@@ -97,11 +97,13 @@ class CiTestCase(TestCase):
52
97
        super(CiTestCase, self).setUp()
97
        super(CiTestCase, self).setUp()
53
98
        if self.with_logs:
98
        if self.with_logs:
54
99
            # Create a log handler so unit tests can search expected logs.
99
            # Create a log handler so unit tests can search expected logs.
56
100
            logger = logging.getLogger()
100
            self.logger = logging.getLogger()
57
101
            self.logs = six.StringIO()
101
            self.logs = six.StringIO()
58
102
            formatter = logging.Formatter('%(levelname)s: %(message)s')
59
102
            handler = logging.StreamHandler(self.logs)
103
            handler = logging.StreamHandler(self.logs)
62
103
            self.old_handlers = logger.handlers
104
            handler.setFormatter(formatter)
63
104
            logger.handlers = [handler]
105
            self.old_handlers = self.logger.handlers
64
106
            self.logger.handlers = [handler]
65
105
107
66
106
    def tearDown(self):
108
    def tearDown(self):
67
107
        if self.with_logs:
109
        if self.with_logs:
68
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py
69
index 42f49e0..b17f389 100644
70
--- a/tests/unittests/test_datasource/test_azure.py
71
+++ b/tests/unittests/test_datasource/test_azure.py
72
@@ -263,7 +263,8 @@ fdescfs            /dev/fd          fdescfs rw              0 0
73
263
            {}, distro=None, paths=self.paths)
263
            {}, distro=None, paths=self.paths)
74
264
        self.assertFalse(dsrc.get_data())
264
        self.assertFalse(dsrc.get_data())
75
265
        self.assertEqual(
265
        self.assertEqual(
77
266
            "Non-Azure DMI asset tag '{0}' discovered.\n".format(nonazure_tag),
266
            "DEBUG: Non-Azure DMI asset tag '{0}' discovered.\n".format(
78
267
                nonazure_tag),
79
267
            self.logs.getvalue())
268
            self.logs.getvalue())
80
268
269
81
269
    def test_basic_seed_dir(self):
270
    def test_basic_seed_dir(self):
82
diff --git a/tests/unittests/test_handler/test_handler_ntp.py b/tests/unittests/test_handler/test_handler_ntp.py
83
index 3a9f7f7..c4299d9 100644
84
--- a/tests/unittests/test_handler/test_handler_ntp.py
85
+++ b/tests/unittests/test_handler/test_handler_ntp.py
86
@@ -216,7 +216,8 @@ class TestNtp(FilesystemMockingTestCase):
87
216
        """When no ntp section is defined handler logs a warning and noops."""
216
        """When no ntp section is defined handler logs a warning and noops."""
88
217
        cc_ntp.handle('cc_ntp', {}, None, None, [])
217
        cc_ntp.handle('cc_ntp', {}, None, None, [])
89
218
        self.assertEqual(
218
        self.assertEqual(
91
219
            'Skipping module named cc_ntp, not present or disabled by cfg\n',
219
            'DEBUG: Skipping module named cc_ntp, '
92
220
            'not present or disabled by cfg\n',
93
220
            self.logs.getvalue())
221
            self.logs.getvalue())
94
221
222
95
222
    def test_ntp_handler_schema_validation_allows_empty_ntp_config(self):
223
    def test_ntp_handler_schema_validation_allows_empty_ntp_config(self):
96
diff --git a/tests/unittests/test_handler/test_handler_write_files.py b/tests/unittests/test_handler/test_handler_write_files.py
97
index fb252d1..88a4742 100644
98
--- a/tests/unittests/test_handler/test_handler_write_files.py
99
+++ b/tests/unittests/test_handler/test_handler_write_files.py
100
@@ -1,10 +1,10 @@
101
1
# This file is part of cloud-init. See LICENSE file for license information.
1
# This file is part of cloud-init. See LICENSE file for license information.
102
2
2
104
3
from cloudinit.config.cc_write_files import write_files
3
from cloudinit.config.cc_write_files import write_files, decode_perms
105
4
from cloudinit import log as logging
4
from cloudinit import log as logging
106
5
from cloudinit import util
5
from cloudinit import util
107
6
6
109
7
from ..helpers import FilesystemMockingTestCase
7
from ..helpers import CiTestCase, FilesystemMockingTestCase
110
8
8
111
9
import base64
9
import base64
112
10
import gzip
10
import gzip
113
@@ -98,6 +98,33 @@ class TestWriteFiles(FilesystemMockingTestCase):
114
98
        self.assertEqual(len(expected), flen_expected)
98
        self.assertEqual(len(expected), flen_expected)
115
99
99
116
100
100
117
101
class TestDecodePerms(CiTestCase):
118
102
119
103
    with_logs = True
120
104
121
105
    def test_none_returns_default(self):
122
106
        """If None is passed as perms, then default should be returned."""
123
107
        default = object()
124
108
        found = decode_perms(None, default, self.logger)
125
109
        self.assertEqual(default, found)
126
110
127
111
    def test_integer(self):
128
112
        """A valid integer should return itself."""
129
113
        found = decode_perms(0o755, None, self.logger)
130
114
        self.assertEqual(0o755, found)
131
115
132
116
    def test_valid_octal_string(self):
133
117
        """A string should be read as octal."""
134
118
        found = decode_perms("644", None, self.logger)
135
119
        self.assertEqual(0o644, found)
136
120
137
121
    def test_invalid_octal_string_returns_default_and_warns(self):
138
122
        """A string with invalid octal should warn and return default."""
139
123
        found = decode_perms("999", None, self.logger)
140
124
        self.assertIsNone(found)
141
125
        self.assertIn("WARNING: Undecodable", self.logs.getvalue())
142
126
143
127
144
101
def _gzip_bytes(data):
128
def _gzip_bytes(data):
145
102
    buf = six.BytesIO()
129
    buf = six.BytesIO()
146
103
    fp = None
130
    fp = None
Status:	Merged
Approved by:	Scott Moser on 2017-06-14
Approved revision:	2f7132a0fa8ae12f9771b5e3c44f93ef1685ea75
Merged at revision:	0fe6a0607408d387f4b0d4482b95afbc5d3f3909
Proposed branch:	~ajorgens/cloud-init:octal-modes
Merge into:	cloud-init:master
Diff against target:	146 lines (+52/-9) 6 files modified cloudinit/config/cc_write_files.py (+9/-1) cloudinit/util.py (+5/-1) tests/unittests/helpers.py (+5/-3) tests/unittests/test_datasource/test_azure.py (+2/-1) tests/unittests/test_handler/test_handler_ntp.py (+2/-1) tests/unittests/test_handler/test_handler_write_files.py (+29/-2)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Scott Moser		2017-06-09	Approve on 2017-06-14
Server Team CI bot	continuous-integration		Approve on 2017-06-12
Chad Smith		2017-06-12	Approve on 2017-06-12
Andrew Jorgensen (community)			Needs Resubmitting on 2017-06-12
Review via email: mp+325424@code.launchpad.net