From 2736fdd6a9219d10954ce58915b971b2a1a03c09 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Thu, 25 Apr 2019 23:34:22 +0200
Subject: [PATCH] tracker: Rely on the preinstalled multimedia demopack
The current test downloads from a legacy location the same contents already
shipped by the official multimedia demopack under `/home/shared`.
On the target and SDK images it is wasteful and silly, as those exact contents
come pre-installed.
On the minimal images this fails since there's not enough storage.
On the base SDK image the decision to not install the multimedia demopack was
taken explicitly as it is not relevant there.
Change the test to only run on the images where it is appropriate and rely on
the multimedia demopack being available out-of-the-box in `/home/shared`.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
test-cases/apparmor-tracker.yaml | 12 +-----------
test-cases/tracker-indexing-local-storage.yaml | 12 +-----------
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/test-cases/apparmor-tracker.yaml b/test-cases/apparmor-tracker.yaml
index cb40ad5..0f299b2 100644
--- a/test-cases/apparmor-tracker.yaml
+++ b/test-cases/apparmor-tracker.yaml
@@ -2,9 +2,7 @@ metadata:
name: apparmor-tracker
format: "Apertis Test Definition 1.0"
image-types:
- minimal: [ armhf-internal, armhf, arm64, amd64 ]
target: [ armhf-internal, amd64 ]
- basesdk: [ amd64 ]
sdk: [ amd64 ]
image-deployment:
- APT
@@ -18,11 +16,7 @@ metadata:
of files in the home directory."
pre-conditions:
- - "Download the media tarball:"
- - $ wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
- - "Create directory and unpack media in the shared folder."
- - $ mkdir -p /home/shared/
- - $ tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
+ - "Requires the multimedia demopack to be pre-installed on the tested image under /home/shared"
expected:
- "Both tests should report pass and not fail:"
@@ -49,10 +43,6 @@ install:
- python3
- python3-gi
- wget
- steps:
- - wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
- - mkdir -p /home/shared/
- - tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
git-repos:
- url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
branch: 'apertis/v2019dev0'
diff --git a/test-cases/tracker-indexing-local-storage.yaml b/test-cases/tracker-indexing-local-storage.yaml
index 94e2f3a..0dc00e1 100644
--- a/test-cases/tracker-indexing-local-storage.yaml
+++ b/test-cases/tracker-indexing-local-storage.yaml
@@ -2,9 +2,7 @@ metadata:
name: tracker-indexing-local-storage
format: "Apertis Test Definition 1.0"
image-types:
- minimal: [ armhf-internal, armhf, arm64, amd64 ]
target: [ armhf-internal, amd64 ]
- basesdk: [ amd64 ]
sdk: [ amd64 ]
image-deployment:
- APT
@@ -15,11 +13,7 @@ metadata:
maintainer: "Apertis Project"
pre-conditions:
- - "Download the media tarball:"
- - $ wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
- - "Create directory and unpack media in the shared folder."
- - $ mkdir -p /home/shared/
- - $ tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
+ - "Requires the multimedia demopack to be pre-installed on the tested image under /home/shared"
expected:
- "The output should be similar to that:"
@@ -56,10 +50,6 @@ install:
- python3-gi
- tracker
- wget
- steps:
- - wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
- - mkdir -p /home/shared/
- - tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
git-repos:
- url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
branch: 'apertis/v2019dev0'
--
GitLab