diff options
| author | Chad Smith <chad.smith@canonical.com> | 2017-10-23 14:46:12 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2017-10-23 14:46:12 -0600 |
| commit | a7f478aafa570abde940037014fabcb0eab16502 (patch) | |
| tree | d838e40b26684f33b3b05c24ead267e28bb1b5a3 /tests/cloud_tests/testcases/modules | |
| parent | 5443ede5e90c0be56f25ac729c5f341cdb4ad31c (diff) | |
| parent | 17a15f9e0ae78e4fc4e24fab0caebdf78f06ef66 (diff) | |
| download | vyos-cloud-init-a7f478aafa570abde940037014fabcb0eab16502.tar.gz vyos-cloud-init-a7f478aafa570abde940037014fabcb0eab16502.zip | |
merge from master at 17.1-25-g17a15f9e
Diffstat (limited to 'tests/cloud_tests/testcases/modules')
| -rw-r--r-- | tests/cloud_tests/testcases/modules/ntp.yaml | 4 | ||||
| -rw-r--r-- | tests/cloud_tests/testcases/modules/user_groups.py | 6 | ||||
| -rw-r--r-- | tests/cloud_tests/testcases/modules/user_groups.yaml | 7 |
3 files changed, 13 insertions, 4 deletions
diff --git a/tests/cloud_tests/testcases/modules/ntp.yaml b/tests/cloud_tests/testcases/modules/ntp.yaml index fbef431b..2530d72e 100644 --- a/tests/cloud_tests/testcases/modules/ntp.yaml +++ b/tests/cloud_tests/testcases/modules/ntp.yaml @@ -4,8 +4,8 @@ cloud_config: | #cloud-config ntp: - pools: {} - servers: {} + pools: [] + servers: [] collect_scripts: ntp_installed: | #!/bin/bash diff --git a/tests/cloud_tests/testcases/modules/user_groups.py b/tests/cloud_tests/testcases/modules/user_groups.py index 67af527b..93b7a82d 100644 --- a/tests/cloud_tests/testcases/modules/user_groups.py +++ b/tests/cloud_tests/testcases/modules/user_groups.py @@ -40,4 +40,10 @@ class TestUserGroups(base.CloudTestCase): out = self.get_data_file('user_cloudy') self.assertRegex(out, r'cloudy:x:[0-9]{3,4}:') + def test_user_root_in_secret(self): + """Test root user is in 'secret' group.""" + user, _, groups = self.get_data_file('root_groups').partition(":") + self.assertIn("secret", groups.split(), + msg="User root is not in group 'secret'") + # vi: ts=4 expandtab diff --git a/tests/cloud_tests/testcases/modules/user_groups.yaml b/tests/cloud_tests/testcases/modules/user_groups.yaml index 71cc9da3..22b5d706 100644 --- a/tests/cloud_tests/testcases/modules/user_groups.yaml +++ b/tests/cloud_tests/testcases/modules/user_groups.yaml @@ -7,7 +7,7 @@ cloud_config: | #cloud-config # Add groups to the system groups: - - secret: [foobar,barfoo] + - secret: [root] - cloud-users # Add users to the system. Users are added after groups are added. @@ -23,7 +23,7 @@ cloud_config: | - name: barfoo gecos: Bar B. Foo sudo: ALL=(ALL) NOPASSWD:ALL - groups: cloud-users + groups: [cloud-users, secret] lock_passwd: true - name: cloudy gecos: Magic Cloud App Daemon User @@ -48,5 +48,8 @@ collect_scripts: user_cloudy: | #!/bin/bash getent passwd cloudy + root_groups: | + #!/bin/bash + groups root # vi: ts=4 expandtab |