From 16ef0f8bad29c5ed17d5b855b89887c4f57cde37 Mon Sep 17 00:00:00 2001 From: Benedikt Loeffler Date: Thu, 3 Aug 2023 11:29:52 +0200 Subject: [PATCH] Test if username is set for diskimage based nodes in AWS Change-Id: I4c13e95baf213831d02c31df0e91c82c2c86d3d8 --- nodepool/tests/fixtures/aws/diskimage.yaml | 1 + nodepool/tests/unit/test_driver_aws.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nodepool/tests/fixtures/aws/diskimage.yaml b/nodepool/tests/fixtures/aws/diskimage.yaml index 14c9a9748..c226f8334 100644 --- a/nodepool/tests/fixtures/aws/diskimage.yaml +++ b/nodepool/tests/fixtures/aws/diskimage.yaml @@ -64,3 +64,4 @@ diskimages: BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2 metadata: diskimage_metadata: diskimage + username: another_user diff --git a/nodepool/tests/unit/test_driver_aws.py b/nodepool/tests/unit/test_driver_aws.py index 7a6a0ff97..50fbdc5be 100644 --- a/nodepool/tests/unit/test_driver_aws.py +++ b/nodepool/tests/unit/test_driver_aws.py @@ -656,7 +656,7 @@ class TestDriverAws(tests.DBTestCase): self.useBuilder(configfile) 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) self.assertEqual(ec2_image.state, 'available') @@ -683,6 +683,7 @@ class TestDriverAws(tests.DBTestCase): self.assertIsNotNone(node.launcher) self.assertEqual(node.connection_type, 'ssh') self.assertEqual(node.shell_type, None) + self.assertEqual(node.username, 'another_user') self.assertEqual(node.attributes, {'key1': 'value1', 'key2': 'value2'}) self.assertEqual(