From 76d58265e34851b78e952a7f275340863c90a9f5 Mon Sep 17 00:00:00 2001 From: Wesley Wiedenmeier Date: Thu, 8 Jun 2017 18:23:31 -0400 Subject: Integration Testing: tox env, pyxld 2.2.3, and revamp framework Massive update to clean up and greatly enhance the integration testing framework developed by Wesley Wiedenmeier. - Updated tox environment to run integration test 'citest' to utilize pylxd 2.2.3 - Add support for distro feature flags - add framework for feature flags to release config with feature groups and overrides allowed in any release conf override level - add support for feature flags in platform and config handling - during collect, skip testcases that require features not supported by the image with a warning message - Enable additional distros (i.e. centos, debian) - Add 'bddeb' command to build a deb from the current working tree cleanly in a container, so deps do not have to be installed on host - Adds a command line option '--preserve-data' that ensures that collected data will be left after tests run. This also allows the directory to store collected data in during the run command to be specified using '--data-dir'. - Updated Read the Docs testing page and doc strings for pep 257 compliance --- tests/cloud_tests/testcases/modules/ssh_import_id.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/cloud_tests/testcases/modules/ssh_import_id.py') diff --git a/tests/cloud_tests/testcases/modules/ssh_import_id.py b/tests/cloud_tests/testcases/modules/ssh_import_id.py index 214e710d..055c6a29 100644 --- a/tests/cloud_tests/testcases/modules/ssh_import_id.py +++ b/tests/cloud_tests/testcases/modules/ssh_import_id.py @@ -1,14 +1,14 @@ # This file is part of cloud-init. See LICENSE file for license information. -"""cloud-init Integration Test Verify Script""" +"""cloud-init Integration Test Verify Script.""" from tests.cloud_tests.testcases import base class TestSshImportId(base.CloudTestCase): - """Test ssh import id module""" + """Test ssh import id module.""" def test_authorized_keys(self): - """Test that ssh keys were imported""" + """Test that ssh keys were imported.""" out = self.get_data_file('auth_keys_ubuntu') # Rather than checking the key fingerprints, you could just check -- cgit v1.2.3 From 10e5195e4a4459d1893801aa9fb486dc2973415d Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Mon, 26 Jun 2017 13:45:52 -0700 Subject: Tests: Simplify the check on ssh-import-id I want to be able to add additional SSH keys to my account, therefore I should not be limiting these tests to look for one specific key. Instead we confirm that the comment in authorized_users has the specified users. --- tests/cloud_tests/testcases/modules/ssh_import_id.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'tests/cloud_tests/testcases/modules/ssh_import_id.py') diff --git a/tests/cloud_tests/testcases/modules/ssh_import_id.py b/tests/cloud_tests/testcases/modules/ssh_import_id.py index 055c6a29..ef156f47 100644 --- a/tests/cloud_tests/testcases/modules/ssh_import_id.py +++ b/tests/cloud_tests/testcases/modules/ssh_import_id.py @@ -11,16 +11,7 @@ class TestSshImportId(base.CloudTestCase): """Test that ssh keys were imported.""" out = self.get_data_file('auth_keys_ubuntu') - # Rather than checking the key fingerprints, you could just check - # the ending comment for where it got imported from in case these - # change in the future :\ - self.assertIn('8sXGTYYw3iQSkOvDUUlIsqdaO+w== powersj@github/' - '18564351 # ssh-import-id gh:powersj', out) - self.assertIn('Hj29SCmXp5Kt5/82cD/VN3NtHw== smoser@brickies-' - 'canonical # ssh-import-id lp:smoser', out) - self.assertIn('7cUDQSXbabilgnzTjHo9mjd/kZ7cLOHP smoser@bart-' - 'canonical # ssh-import-id lp:smoser', out) - self.assertIn('aX0VHGXvHAQlPl4n7+FzAE1UmWFYEGrsSoNvLv3 smose' - 'r@kaypeah # ssh-import-id lp:smoser', out) + self.assertIn('# ssh-import-id gh:powersj', out) + self.assertIn('# ssh-import-id lp:smoser', out) # vi: ts=4 expandtab -- cgit v1.2.3