Acceptance Tests: rename attribute holding the distro image checksum
authorCleber Rosa <crosa@redhat.com>
Wed, 14 Apr 2021 22:14:55 +0000 (18:14 -0400)
committerCleber Rosa <crosa@redhat.com>
Tue, 13 Jul 2021 17:18:50 +0000 (13:18 -0400)
This renames the attribute that holds the checksum for the image Linux
distribution image used.

The current name of the attribute is not very descriptive.  Also, in
preparation for making the distribution used configurable, which will
add distro related parameters, attributes and tags, let's make the
naming of those more uniform.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20210414221457.1653745-2-crosa@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[CR: split long lines]
Signed-off-by: Cleber Rosa <crosa@redhat.com>
tests/acceptance/avocado_qemu/__init__.py
tests/acceptance/boot_linux.py

index 420c00f1a95b7cdc94cf7c517de9564264cd419e..0e62c15c60d1ec0bff4fc3ed31deb136ecac8402 100644 (file)
@@ -312,7 +312,7 @@ class LinuxTest(Test, LinuxSSHMixIn):
     """
 
     timeout = 900
-    chksum = None
+    distro_checksum = None
     username = 'root'
     password = 'password'
 
@@ -360,7 +360,7 @@ class LinuxTest(Test, LinuxSSHMixIn):
         try:
             boot = vmimage.get(
                 'fedora', arch=image_arch, version='31',
-                checksum=self.chksum,
+                checksum=self.distro_checksum,
                 algorithm='sha256',
                 cache_dir=self.cache_dirs[0],
                 snapshot_dir=self.workdir)
index 4c8a5994b2998f14b2b21728363ab497bfc22a4b..3901c23690246259dbd8f476d004d6dfac222363 100644 (file)
@@ -20,7 +20,8 @@ class BootLinuxX8664(LinuxTest):
     :avocado: tags=arch:x86_64
     """
 
-    chksum = 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0'
+    distro_checksum = ('e3c1b309d9203604922d6e255c2c5d09'
+                       '8a309c2d46215d8fc026954f3c5c27a0')
 
     def test_pc_i440fx_tcg(self):
         """
@@ -66,7 +67,8 @@ class BootLinuxAarch64(LinuxTest):
     :avocado: tags=machine:gic-version=2
     """
 
-    chksum = '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49'
+    distro_checksum = ('1e18d9c0cf734940c4b5d5ec592facae'
+                       'd2af0ad0329383d5639c997fdf16fe49')
 
     def add_common_args(self):
         self.vm.add_args('-bios',
@@ -119,7 +121,8 @@ class BootLinuxPPC64(LinuxTest):
     :avocado: tags=arch:ppc64
     """
 
-    chksum = '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58'
+    distro_checksum = ('7c3528b85a3df4b2306e892199a9e1e4'
+                       '3f991c506f2cc390dc4efa2026ad2f58')
 
     def test_pseries_tcg(self):
         """
@@ -136,7 +139,8 @@ class BootLinuxS390X(LinuxTest):
     :avocado: tags=arch:s390x
     """
 
-    chksum = '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d'
+    distro_checksum = ('4caaab5a434fd4d1079149a072fdc789'
+                       '1e354f834d355069ca982fdcaf5a122d')
 
     @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
     def test_s390_ccw_virtio_tcg(self):