From b27f713ae5b4c5b38eda63758dbaeab92be13b9d Mon Sep 17 00:00:00 2001 From: Dominic Schlegel Date: Tue, 3 Apr 2018 12:19:54 -0600 Subject: correct documentation to match correct attribute name usage. LP: #1420018 --- tests/cloud_tests/testcases/examples/including_user_groups.yaml | 2 +- tests/cloud_tests/testcases/modules/user_groups.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/cloud_tests') 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 -- cgit v1.2.3 From 05926e48eae0fa70a26da6449617e04e87c4e704 Mon Sep 17 00:00:00 2001 From: Chad Smith Date: Tue, 3 Apr 2018 16:52:13 -0600 Subject: tests: fix integration tests to support lxd 3.0 release Integration tests previously had a logic path that was unexercised on jenkins because we were on an older version of lxc. With an upgrade to lxd version 3.0 we need to bump pylxd dependency pin and fix a typo in integration tests which checked the lxd version. --- integration-requirements.txt | 4 ++-- tests/cloud_tests/platforms/lxd/instance.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/cloud_tests') diff --git a/integration-requirements.txt b/integration-requirements.txt index 45baac6a..df3a73ef 100644 --- a/integration-requirements.txt +++ b/integration-requirements.txt @@ -12,8 +12,8 @@ boto3==1.5.9 paramiko==2.4.0 # lxd backend -# 01/10/2018: enables use of lxd as snap support -git+https://github.com/lxc/pylxd.git@0722955260a6557e6d2ffde1896bfe0707bbca27 +# 04/03/2018: enables use of lxd 3.0 +git+https://github.com/lxc/pylxd.git@1a85a12a23401de6e96b1aeaf59ecbff2e88f49d # finds latest image information 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: -- cgit v1.2.3