[OpenWrt schema] Made file "mode" property required

Breaking change.
openwisp · Mar 14, 2016 · 96d216d · 96d216d
1 parent 04c6058
commit 96d216d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/netjsonconfig/backends/openwrt/schema.py b/netjsonconfig/backends/openwrt/schema.py
@@ -330,6 +330,7 @@
                 "additionalProperties": False,
                 "required": [
                     "path",
+                    "mode",
                     "contents"
                 ],
                 "properties": {

diff --git a/tests/openwisp/test_backend.py b/tests/openwisp/test_backend.py
@@ -104,10 +104,12 @@ class TestBackend(unittest.TestCase, _TabsMixin):
         "files": [
             {
                 "path": "/openvpn/x509/ca_1_service.pem",
+                "mode": "0644",
                 "contents": "-----BEGIN CERTIFICATE-----\ntest\n-----END CERTIFICATE-----\n"  # noqa
             },
             {
                 "path": "/openvpn/x509/l2vpn_client_2693.pem",
+                "mode": "0644",
                 "contents": "-----BEGIN CERTIFICATE-----\ntest==\n-----END CERTIFICATE-----\n-----BEGIN RSA PRIVATE KEY-----\ntest\n-----END RSA PRIVATE KEY-----\n"  # noqa
             }
         ]
@@ -225,6 +227,7 @@ def test_cron(self):
         config['files'] = [
             {
                 "path": "/crontabs/root",
+                "mode": "0644",
                 "contents": "* * * * * echo 'test' > /tmp/test-cron"
             }
         ]

diff --git a/tests/openwrt/test_backend.py b/tests/openwrt/test_backend.py
@@ -283,11 +283,13 @@ def test_file_inclusion(self):
             "files": [
                 {
                     "path": "/etc/crontabs/root",
+                    "mode": "0644",
                     "contents": '* * * * * echo "test" > /etc/testfile\n'
                                 '* * * * * echo "test2" > /etc/testfile2'
                 },
                 {
                     "path": "/etc/dummy.conf",
+                    "mode": "0644",
                     "contents": "testing!"
                 }
             ]
@@ -316,8 +318,8 @@ def test_file_permissions(self):
             "files": [
                 {
                     "path": "/tmp/hello.sh",
+                    "mode": "0755",
                     "contents": "echo 'hello world'",
-                    "mode": "0755"
                 }
             ]
         })
@@ -332,6 +334,7 @@ def test_file_schema(self):
             "files": [
                 {
                     "path": "/tmp/hello.sh",
+                    "mode": "0644",
                     "contents": "echo 'hello world'"
                 }
             ]

diff --git a/tests/test_bin.py b/tests/test_bin.py
@@ -105,6 +105,7 @@ def test_valid_arg(self):
             'files': [
                 {
                     'path': '/etc/test.txt',
+                    'mode': '0644',
                     'contents': 'test_valid_arg'
                 }
             ]