zuul/nodepool
Code Issues Proposed changes

Merge "Test if username is set for diskimage based nodes in AWS"

Browse Source
This commit is contained in:
Zuul 2023-08-24 08:54:51 +00:00 committed by Gerrit Code Review
commit 77e2550326
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nodepool/tests/fixtures/aws/diskimage.yaml vendored
View File

@ -64,3 +64,4 @@ diskimages:
BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2 BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2
metadata: metadata:
diskimage_metadata: diskimage diskimage_metadata: diskimage
username: another_user

3
nodepool/tests/unit/test_driver_aws.py
View File

@ -715,7 +715,7 @@ class TestDriverAws(tests.DBTestCase):
self.useBuilder(configfile) self.useBuilder(configfile)
image = self.waitForImage('ec2-us-west-2', 'fake-image') image = self.waitForImage('ec2-us-west-2', 'fake-image')
self.assertEqual(image.username, 'zuul') self.assertEqual(image.username, 'another_user')
ec2_image = self.ec2.Image(image.external_id) ec2_image = self.ec2.Image(image.external_id)
self.assertEqual(ec2_image.state, 'available') self.assertEqual(ec2_image.state, 'available')
@ -742,6 +742,7 @@ class TestDriverAws(tests.DBTestCase):
self.assertIsNotNone(node.launcher) self.assertIsNotNone(node.launcher)
self.assertEqual(node.connection_type, 'ssh') self.assertEqual(node.connection_type, 'ssh')
self.assertEqual(node.shell_type, None) self.assertEqual(node.shell_type, None)
self.assertEqual(node.username, 'another_user')
self.assertEqual(node.attributes, self.assertEqual(node.attributes,
{'key1': 'value1', 'key2': 'value2'}) {'key1': 'value1', 'key2': 'value2'})
self.assertEqual( self.assertEqual(