Commit 8f0d25c4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/acceptance-fixes-20200407' into staging 

Acceptance tests patches

- Fixed EXEC migration
- Reduce PReP/40p artifacts download failures,
- Disable Leon3 HelenOS
- Speed up Travis-CI job by using a specific cache bucket

CI jobs results:
  https://gitlab.com/philmd/qemu/pipelines/133379305
  https://travis-ci.org/github/philmd/qemu/builds/671762970



# gpg: Signature made Tue 07 Apr 2020 11:37:57 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/acceptance-fixes-20200407:
  .travis.yml: Cache acceptance-test assets
  tests/acceptance/machine_sparc_leon3: Disable HelenOS test
  tests/acceptance/ppc_prep_40p: Use mirror for ftp.software.ibm.com
  tests/acceptance/ppc_prep_40p: Use cdn.netbsd.org hostname
  Acceptance test: Fix to EXEC migration

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ca74fc19 a41f1675

.travis.yml

+2 −0
Original line number Diff line number Diff line
@@ -318,8 +318,10 @@ jobs: 
      env:

        - CONFIG="--enable-tools --target-list=aarch64-softmmu,alpha-softmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu"

        - TEST_CMD="make check-acceptance"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-acceptance"

      after_script:

        - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cat

        - du -chs $HOME/avocado/data/cache

      addons:

        apt:

          packages:

tests/acceptance/machine_sparc_leon3.py

+4 −0
Original line number Diff line number Diff line
@@ -7,12 +7,16 @@ 


from avocado_qemu import Test

from avocado_qemu import wait_for_console_pattern

from avocado import skip





class Leon3Machine(Test):



    timeout = 60



    @skip("Test currently broken")

    # A Window Underflow exception occurs before booting the kernel,

    # and QEMU exit calling cpu_abort(), which makes this test to fail.

    def test_leon3_helenos_uimage(self):

        """

        :avocado: tags=arch:sparc

tests/acceptance/migration.py

+3 −3
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ class Migration(Test): 


    @skipUnless(find_command('nc', default=False), "'nc' command not found")

    def test_migration_with_exec(self):

        """

        The test works for both netcat-traditional and netcat-openbsd packages

        """

        """The test works for both netcat-traditional and netcat-openbsd packages."""

        free_port = self._get_free_port()

        dest_uri = 'exec:nc -l localhost %u' % free_port

        src_uri = 'exec:nc localhost %u' % free_port

        self.do_migrate(dest_uri, src_uri)

tests/acceptance/ppc_prep_40p.py

+4 −3
Original line number Diff line number Diff line
@@ -30,11 +30,12 @@ class IbmPrep40pMachine(Test): 
        :avocado: tags=machine:40p

        :avocado: tags=slowness:high

        """

        bios_url = ('ftp://ftp.boulder.ibm.com/rs6000/firmware/'

        bios_url = ('http://ftpmirror.your.org/pub/misc/'

                    'ftp.software.ibm.com/rs6000/firmware/'

                    '7020-40p/P12H0456.IMG')

        bios_hash = '1775face4e6dc27f3a6ed955ef6eb331bf817f03'

        bios_path = self.fetch_asset(bios_url, asset_hash=bios_hash)

        drive_url = ('https://ftp.netbsd.org/pub/NetBSD/NetBSD-archive/'

        drive_url = ('https://cdn.netbsd.org/pub/NetBSD/NetBSD-archive/'

                     'NetBSD-4.0/prep/installation/floppy/generic_com0.fs')

        drive_hash = 'dbcfc09912e71bd5f0d82c7c1ee43082fb596ceb'

        drive_path = self.fetch_asset(drive_url, asset_hash=drive_hash)
@@ -66,7 +67,7 @@ class IbmPrep40pMachine(Test): 
        :avocado: tags=arch:ppc

        :avocado: tags=machine:40p

        """

        drive_url = ('https://ftp.netbsd.org/pub/NetBSD/iso/7.1.2/'

        drive_url = ('https://cdn.netbsd.org/pub/NetBSD/iso/7.1.2/'

                     'NetBSD-7.1.2-prep.iso')

        drive_hash = 'ac6fa2707d888b36d6fa64de6e7fe48e'

        drive_path = self.fetch_asset(drive_url, asset_hash=drive_hash,