[tracker-oci-images/sam/remove-tracker] Remove Tracker package from test environment



commit a4d30df4efa1c5dc0febaeabb8f2fe7849396fa6
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun May 26 19:26:03 2019 +0200

    Remove Tracker package from test environment
    
    This is possible from Tracker 2.3 onwards, due to
    https://gitlab.gnome.org/GNOME/tracker/merge_requests/95.

 fedora/cleanup.sh | 8 +++++++-
 fedora/prepare.sh | 8 --------
 2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/fedora/cleanup.sh b/fedora/cleanup.sh
index b71603b..60fe773 100644
--- a/fedora/cleanup.sh
+++ b/fedora/cleanup.sh
@@ -2,7 +2,13 @@
 
 set -eu
 
+# This is installed by `dnf build-dep tracker-miners`. We don't want it in the
+# test environment, so we can be sure that tests are running against what's in
+# the build tree and not what's installed in /usr.
+echo "Removing Tracker package"
+dnf remove -y tracker
+
 echo "Removing DNF cache"
 dnf clean all
 
-rm -R /root/*
\ No newline at end of file
+rm -R /root/*
diff --git a/fedora/prepare.sh b/fedora/prepare.sh
index b9ec9e2..5d75b64 100644
--- a/fedora/prepare.sh
+++ b/fedora/prepare.sh
@@ -22,14 +22,6 @@ dnf install -y git
 # We need to be able to run tests as a normal user, not 'root'.
 useradd -Um tracker
 
-# This shouldn't be needed, but currently is.
-#
-# Some of the tests depend on the GSettings schemas being installed.
-#
-# Some of the tests also seem to interact with the session-wide Tracker
-# instance!
-dnf install -y tracker
-
 # This is needed for the functional-tests.
 dnf install -y python3-gobject
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]