diff options
author | Chad Smith <chad.smith@canonical.com> | 2018-04-03 17:01:38 -0600 |
---|---|---|
committer | Chad Smith <chad.smith@canonical.com> | 2018-04-03 17:01:38 -0600 |
commit | 2901835b6ab89f553ce4c3bb22451fad5f3a4f68 (patch) | |
tree | 444f44ab4dece9b8daba3feff89204547c22fab8 /tests/cloud_tests | |
parent | 710dbc8293706ab004326ce9b882bceb6e8cca93 (diff) | |
parent | 05926e48eae0fa70a26da6449617e04e87c4e704 (diff) | |
download | vyos-cloud-init-2901835b6ab89f553ce4c3bb22451fad5f3a4f68.tar.gz vyos-cloud-init-2901835b6ab89f553ce4c3bb22451fad5f3a4f68.zip |
merge from master at 18.2-4-g05926e48
Diffstat (limited to 'tests/cloud_tests')
-rw-r--r-- | tests/cloud_tests/platforms/lxd/instance.py | 2 | ||||
-rw-r--r-- | tests/cloud_tests/testcases/examples/including_user_groups.yaml | 2 | ||||
-rw-r--r-- | tests/cloud_tests/testcases/modules/user_groups.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/cloud_tests/platforms/lxd/instance.py b/tests/cloud_tests/platforms/lxd/instance.py index 0488da57..0d957bca 100644 --- a/tests/cloud_tests/platforms/lxd/instance.py +++ b/tests/cloud_tests/platforms/lxd/instance.py @@ -210,7 +210,7 @@ def _has_proper_console_support(): reason = "LXD server does not support console api extension" else: dver = info.get('environment', {}).get('driver_version', "") - if dver.startswith("2.") or dver.startwith("1."): + if dver.startswith("2.") or dver.startswith("1."): reason = "LXD Driver version not 3.x+ (%s)" % dver else: try: diff --git a/tests/cloud_tests/testcases/examples/including_user_groups.yaml b/tests/cloud_tests/testcases/examples/including_user_groups.yaml index 469d03c3..77528d98 100644 --- a/tests/cloud_tests/testcases/examples/including_user_groups.yaml +++ b/tests/cloud_tests/testcases/examples/including_user_groups.yaml @@ -16,7 +16,7 @@ cloud_config: | - default - name: foobar gecos: Foo B. Bar - primary-group: foobar + primary_group: foobar groups: users expiredate: 2038-01-19 lock_passwd: false diff --git a/tests/cloud_tests/testcases/modules/user_groups.yaml b/tests/cloud_tests/testcases/modules/user_groups.yaml index 22b5d706..675dfb8c 100644 --- a/tests/cloud_tests/testcases/modules/user_groups.yaml +++ b/tests/cloud_tests/testcases/modules/user_groups.yaml @@ -15,7 +15,7 @@ cloud_config: | - default - name: foobar gecos: Foo B. Bar - primary-group: foobar + primary_group: foobar groups: users expiredate: 2038-01-19 lock_passwd: false |