From ba305cd5400e0a5abf220690791d23798b95554a Mon Sep 17 00:00:00 2001
From: Luis Araujo <luis.araujo@collabora.co.uk>
Date: Tue, 20 Sep 2016 16:02:12 +0800
Subject: [PATCH] Remove apparmor-webkit-clutter automated test

This test is deprecated as a new test need to be developed to be run
from Canterbury (https://phabricator.apertis.org/T2119).

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D4344
---
 apparmor/apparmor-webkit-clutter.yaml | 32 ---------------------------
 templates/group-apparmor-tpl.json     |  5 -----
 2 files changed, 37 deletions(-)
 delete mode 100644 apparmor/apparmor-webkit-clutter.yaml

diff --git a/apparmor/apparmor-webkit-clutter.yaml b/apparmor/apparmor-webkit-clutter.yaml
deleted file mode 100644
index 77ec988f..00000000
--- a/apparmor/apparmor-webkit-clutter.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-metadata:
-  name: apparmor-webkit-clutter
-  format: "Lava-Test-Shell Test Definition 1.0"
-  description: "Tests that the webkit-clutter abstraction doesn't cause false negatives 
-                and that it does not allow arbitrary reading of files in the home directory."
-  maintainer: "luis.araujo@collabora.co.uk"
-  scope:
-  - functional
-  devices:
-  - i386
-  environment:
-  - lava-test-shell
-
-install:
-  deps:
-  - busybox
-  - apertis-tests-apparmor-report
-  - apertis-tests-apparmor-webkit-clutter
-
-run:
-  steps:
-  - echo -n | sudo tee /var/log/audit/audit.log
-  - "head -v /sys/kernel/security/apparmor/policy/profiles/usr.lib.apertis-tests.apparmor.webkit-clutter.webkit-clutter.*/name || true"
-  - "common/run-test-in-systemd --name preprocess-profile --timeout 90 apparmor_parser --skip-cache --preprocess --verbose /etc/apparmor.d/usr.lib.apertis-tests.apparmor.webkit-clutter.webkit-clutter"
-  - "common/run-test-in-systemd --name load-profile --timeout 90 apparmor_parser --skip-cache --replace --verbose /etc/apparmor.d/usr.lib.apertis-tests.apparmor.webkit-clutter.webkit-clutter"
-  - "common/run-test-in-systemd --name profile-is-loaded --timeout 90 head -v /sys/kernel/security/apparmor/policy/profiles/usr.lib.apertis-tests.apparmor.webkit-clutter.webkit-clutter.*/name"
-  - common/run-test-in-systemd --basename --timeout 90 /usr/lib/apertis-tests/apparmor/webkit-clutter/test-webkit-clutter
-  - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
-
-parse:
-  pattern: ^(?P<test_case_id>[\w\-\.]+):\s(?P<result>PASS|pass|FAIL|fail|SKIP|skip|UNKNOWN|unknown)$
-
diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index d892034a..8dcd9154 100644
--- a/templates/group-apparmor-tpl.json
+++ b/templates/group-apparmor-tpl.json
@@ -120,11 +120,6 @@
             "git-repo": "https://git.apertis.org/git/apertis-tests.git",
             "revision": "master",
             "testdef": "apparmor/apparmor-utils.yaml"
-          },
-          {
-            "git-repo": "https://git.apertis.org/git/apertis-tests.git",
-            "revision": "master",
-            "testdef": "apparmor/apparmor-webkit-clutter.yaml"
           }
         ]
       }
-- 
GitLab