|
 |
c44fa3 |
From 5fef9bb8c9899e64306a87ab89574f3afb9968de Mon Sep 17 00:00:00 2001
|
|
|
c44fa3 |
From: Nicola Sella <nsella@redhat.com>
|
|
|
c44fa3 |
Date: Wed, 7 Dec 2022 16:54:02 +0100
|
|
|
c44fa3 |
Subject: [PATCH 3/3] Revert "Add more choicerules tests"
|
|
|
c44fa3 |
|
|
|
c44fa3 |
This reverts commit ce9dda7d3e5b27f4cd883eb69e7ea5cace0a2828.
|
|
|
c44fa3 |
---
|
|
|
c44fa3 |
test/testcases/choicerules/choice1.t | 27 ---------------
|
|
|
c44fa3 |
test/testcases/choicerules/choice1b.t | 18 ----------
|
|
|
c44fa3 |
test/testcases/choicerules/choice2.t | 21 ------------
|
|
|
c44fa3 |
test/testcases/choicerules/choice2b.t | 47 ---------------------------
|
|
|
c44fa3 |
test/testcases/choicerules/choice3.t | 16 ---------
|
|
|
c44fa3 |
test/testcases/choicerules/choice3b.t | 31 ------------------
|
|
|
c44fa3 |
test/testcases/choicerules/choice4.t | 18 ----------
|
|
|
c44fa3 |
test/testcases/choicerules/choice5.t | 21 ------------
|
|
|
c44fa3 |
test/testcases/choicerules/choice6.t | 28 ----------------
|
|
|
c44fa3 |
9 files changed, 227 deletions(-)
|
|
|
c44fa3 |
delete mode 100644 test/testcases/choicerules/choice1.t
|
|
|
c44fa3 |
delete mode 100644 test/testcases/choicerules/choice1b.t
|
|
|
c44fa3 |
delete mode 100644 test/testcases/choicerules/choice2b.t
|
|
|
c44fa3 |
delete mode 100644 test/testcases/choicerules/choice3b.t
|
|
|
c44fa3 |
delete mode 100644 test/testcases/choicerules/choice5.t
|
|
|
c44fa3 |
delete mode 100644 test/testcases/choicerules/choice6.t
|
|
|
c44fa3 |
|
|
|
c44fa3 |
diff --git a/test/testcases/choicerules/choice1.t b/test/testcases/choicerules/choice1.t
|
|
|
c44fa3 |
deleted file mode 100644
|
|
|
c44fa3 |
index fbd5184a..00000000
|
|
|
c44fa3 |
--- a/test/testcases/choicerules/choice1.t
|
|
|
c44fa3 |
+++ /dev/null
|
|
|
c44fa3 |
@@ -1,27 +0,0 @@
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-#Rule #2:
|
|
|
c44fa3 |
-# !A-2-1.noarch [3] (w1)
|
|
|
c44fa3 |
-# B-2-1.noarch [4] (w2)
|
|
|
c44fa3 |
-# C-2-1.noarch [5]
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-# ==> Choice Rule
|
|
|
c44fa3 |
-# !A-2-1.noarch [3] (w1)
|
|
|
c44fa3 |
-# B-2-1.noarch [4] (w2)
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-repo system 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: B 1 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 1
|
|
|
c44fa3 |
-repo available 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: A 2 1 noarch
|
|
|
c44fa3 |
-#>=Req: P = 2
|
|
|
c44fa3 |
-#>=Pkg: B 2 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 2
|
|
|
c44fa3 |
-#>=Pkg: C 2 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 2
|
|
|
c44fa3 |
-system i686 rpm system
|
|
|
c44fa3 |
-
|
|
|
c44fa3 |
-job install name A
|
|
|
c44fa3 |
-result transaction,problems <inline>
|
|
|
c44fa3 |
-result transaction,problems <inline>
|
|
|
c44fa3 |
-#>install A-2-1.noarch@available
|
|
|
c44fa3 |
-#>upgrade B-1-1.noarch@system B-2-1.noarch@available
|
|
|
c44fa3 |
diff --git a/test/testcases/choicerules/choice1b.t b/test/testcases/choicerules/choice1b.t
|
|
|
c44fa3 |
deleted file mode 100644
|
|
|
c44fa3 |
index fc47b722..00000000
|
|
|
c44fa3 |
--- a/test/testcases/choicerules/choice1b.t
|
|
|
c44fa3 |
+++ /dev/null
|
|
|
c44fa3 |
@@ -1,18 +0,0 @@
|
|
|
c44fa3 |
-repo system 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: B 1 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 1
|
|
|
c44fa3 |
-repo available 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: X 1 1 noarch
|
|
|
c44fa3 |
-#>=Pkg: Y 1 1 noarch
|
|
|
c44fa3 |
-#>=Pkg: A 2 1 noarch
|
|
|
c44fa3 |
-#>=Req: P = 2 <IF> (X & Y)
|
|
|
c44fa3 |
-#>=Pkg: B 2 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 2
|
|
|
c44fa3 |
-#>=Pkg: C 2 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 2
|
|
|
c44fa3 |
-system i686 rpm system
|
|
|
c44fa3 |
-
|
|
|
c44fa3 |
-job install name A
|
|
|
c44fa3 |
-result transaction,problems <inline>
|
|
|
c44fa3 |
-result transaction,problems <inline>
|
|
|
c44fa3 |
-#>install A-2-1.noarch@available
|
|
|
c44fa3 |
diff --git a/test/testcases/choicerules/choice2.t b/test/testcases/choicerules/choice2.t
|
|
|
c44fa3 |
index 1eb6c7c3..cb067b18 100644
|
|
|
c44fa3 |
--- a/test/testcases/choicerules/choice2.t
|
|
|
c44fa3 |
+++ b/test/testcases/choicerules/choice2.t
|
|
|
c44fa3 |
@@ -1,24 +1,3 @@
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-# Test that updating package B will update package A
|
|
|
c44fa3 |
-# instead of pulling in new package C
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-#Rule #5:
|
|
|
c44fa3 |
-# !A-2-2.noarch [5] (w1)
|
|
|
c44fa3 |
-# B-2-1.noarch [6] (w2)
|
|
|
c44fa3 |
-# C-2-1.noarch [8]
|
|
|
c44fa3 |
-#Rule #7:
|
|
|
c44fa3 |
-# !A-2-1.noarch [4] (w1)
|
|
|
c44fa3 |
-# B-2-1.noarch [6] (w2)
|
|
|
c44fa3 |
-# C-2-1.noarch [8]
|
|
|
c44fa3 |
-#Rule #8:
|
|
|
c44fa3 |
-# !A-1-1.noarch [2]I (w1)
|
|
|
c44fa3 |
-# B-1-1.noarch [3]I (w2)
|
|
|
c44fa3 |
-# C-1-1.noarch [7]
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-# ==> Choice Rule for #8:
|
|
|
c44fa3 |
-# !A-1-1.noarch [2]I (w1)
|
|
|
c44fa3 |
-# B-1-1.noarch [3]I (w2)
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
repo system 0 testtags <inline>
|
|
|
c44fa3 |
#>=Pkg: A 1 1 noarch
|
|
|
c44fa3 |
#>=Req: P = 1
|
|
|
c44fa3 |
diff --git a/test/testcases/choicerules/choice2b.t b/test/testcases/choicerules/choice2b.t
|
|
|
c44fa3 |
deleted file mode 100644
|
|
|
c44fa3 |
index ae619f77..00000000
|
|
|
c44fa3 |
--- a/test/testcases/choicerules/choice2b.t
|
|
|
c44fa3 |
+++ /dev/null
|
|
|
c44fa3 |
@@ -1,47 +0,0 @@
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-# Test that updating package B will update package A
|
|
|
c44fa3 |
-# instead of pulling in new package C
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-#Rule #5:
|
|
|
c44fa3 |
-# !A-2-2.noarch [5] (w1)
|
|
|
c44fa3 |
-# B-2-1.noarch [6] (w2)
|
|
|
c44fa3 |
-# C-2-1.noarch [8]
|
|
|
c44fa3 |
-#Rule #7:
|
|
|
c44fa3 |
-# !A-2-1.noarch [4] (w1)
|
|
|
c44fa3 |
-# B-2-1.noarch [6] (w2)
|
|
|
c44fa3 |
-# C-2-1.noarch [8]
|
|
|
c44fa3 |
-#Rule #8:
|
|
|
c44fa3 |
-# !A-1-1.noarch [2]I (w1)
|
|
|
c44fa3 |
-# B-1-1.noarch [3]I (w2)
|
|
|
c44fa3 |
-# C-1-1.noarch [7]
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-# ==> Choice Rule for #8:
|
|
|
c44fa3 |
-# !A-1-1.noarch [2]I (w1)
|
|
|
c44fa3 |
-# B-1-1.noarch [3]I (w2)
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-repo system 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: A 1 1 noarch
|
|
|
c44fa3 |
-#>=Req: P = 1
|
|
|
c44fa3 |
-#>=Pkg: B 1 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 1
|
|
|
c44fa3 |
-repo available 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: A 1 1 noarch
|
|
|
c44fa3 |
-#>=Req: P = 1
|
|
|
c44fa3 |
-#>=Pkg: B 1 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 1
|
|
|
c44fa3 |
-#>=Pkg: A 2 1 noarch
|
|
|
c44fa3 |
-#>=Req: P = 2
|
|
|
c44fa3 |
-#>=Pkg: A 2 2 noarch
|
|
|
c44fa3 |
-#>=Req: P = 2
|
|
|
c44fa3 |
-#>=Pkg: B 2 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 2
|
|
|
c44fa3 |
-#>=Pkg: C 1 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 1
|
|
|
c44fa3 |
-#>=Pkg: C 2 1 noarch
|
|
|
c44fa3 |
-#>=Prv: P = 2
|
|
|
c44fa3 |
-system i686 rpm system
|
|
|
c44fa3 |
-
|
|
|
c44fa3 |
-job update name B
|
|
|
c44fa3 |
-result transaction,problems <inline>
|
|
|
c44fa3 |
-#>upgrade A-1-1.noarch@system A-2-2.noarch@available
|
|
|
c44fa3 |
-#>upgrade B-1-1.noarch@system B-2-1.noarch@available
|
|
|
c44fa3 |
diff --git a/test/testcases/choicerules/choice3.t b/test/testcases/choicerules/choice3.t
|
|
|
c44fa3 |
index 1b82e691..d5d41acc 100644
|
|
|
c44fa3 |
--- a/test/testcases/choicerules/choice3.t
|
|
|
c44fa3 |
+++ b/test/testcases/choicerules/choice3.t
|
|
|
c44fa3 |
@@ -1,19 +1,3 @@
|
|
|
c44fa3 |
-# Do not block an update because of a choice rule
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-#Rule #3:
|
|
|
c44fa3 |
-# !B-1-1.noarch [4] (w1)
|
|
|
c44fa3 |
-# A-1-1.noarch [2]I (w2)
|
|
|
c44fa3 |
-# Anew-2-1.noarch [6]
|
|
|
c44fa3 |
-#Rule #4:
|
|
|
c44fa3 |
-# !B-1-1.noarch [3]I (w1)
|
|
|
c44fa3 |
-# A-1-1.noarch [2]I (w2)
|
|
|
c44fa3 |
-# Anew-2-1.noarch [6]
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-# ==> No choice rule for Rule#4!
|
|
|
c44fa3 |
-# ==> Choice Rule for #3:
|
|
|
c44fa3 |
-# !B-1-1.noarch [4] (w1)
|
|
|
c44fa3 |
-# A-1-1.noarch [2]I (w2)
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
repo system 0 testtags <inline>
|
|
|
c44fa3 |
#>=Pkg: A 1 1 noarch
|
|
|
c44fa3 |
#>=Prv: libA
|
|
|
c44fa3 |
diff --git a/test/testcases/choicerules/choice3b.t b/test/testcases/choicerules/choice3b.t
|
|
|
c44fa3 |
deleted file mode 100644
|
|
|
c44fa3 |
index fb9c7250..00000000
|
|
|
c44fa3 |
--- a/test/testcases/choicerules/choice3b.t
|
|
|
c44fa3 |
+++ /dev/null
|
|
|
c44fa3 |
@@ -1,31 +0,0 @@
|
|
|
c44fa3 |
-# Do not block an update because of a choice rule
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-#Rule #3:
|
|
|
c44fa3 |
-# !B-1-1.noarch [4] (w1)
|
|
|
c44fa3 |
-# A-1-1.noarch [2]I (w2)
|
|
|
c44fa3 |
-# Anew-2-1.noarch [6]
|
|
|
c44fa3 |
-#Rule #4:
|
|
|
c44fa3 |
-# !B-1-1.noarch [3]I (w1)
|
|
|
c44fa3 |
-# A-1-1.noarch [2]I (w2)
|
|
|
c44fa3 |
-# Anew-2-1.noarch [6]
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-# ==> No choice rule for Rule#4!
|
|
|
c44fa3 |
-# ==> Choice Rule for #3:
|
|
|
c44fa3 |
-# !B-1-1.noarch [4] (w1)
|
|
|
c44fa3 |
-# A-1-1.noarch [2]I (w2)
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-repo system 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: A 1 1 noarch
|
|
|
c44fa3 |
-#>=Prv: libA
|
|
|
c44fa3 |
-#>=Pkg: B 1 1 noarch
|
|
|
c44fa3 |
-#>=Req: libA
|
|
|
c44fa3 |
-repo available 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: A 2 1 noarch
|
|
|
c44fa3 |
-#>=Pkg: Anew 2 1 noarch
|
|
|
c44fa3 |
-#>=Prv: libA
|
|
|
c44fa3 |
-system i686 rpm system
|
|
|
c44fa3 |
-
|
|
|
c44fa3 |
-job update all packages
|
|
|
c44fa3 |
-result transaction,problems <inline>
|
|
|
c44fa3 |
-#>install Anew-2-1.noarch@available
|
|
|
c44fa3 |
-#>upgrade A-1-1.noarch@system A-2-1.noarch@available
|
|
|
c44fa3 |
diff --git a/test/testcases/choicerules/choice4.t b/test/testcases/choicerules/choice4.t
|
|
|
c44fa3 |
index 7378a569..1bf9f487 100644
|
|
|
c44fa3 |
--- a/test/testcases/choicerules/choice4.t
|
|
|
c44fa3 |
+++ b/test/testcases/choicerules/choice4.t
|
|
|
c44fa3 |
@@ -1,21 +1,3 @@
|
|
|
c44fa3 |
-# This tests that A is updated instead of Anew being installed
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-#Rule #4:
|
|
|
c44fa3 |
-# !B-2-2.noarch [11] (w1)
|
|
|
c44fa3 |
-# A-2-2.noarch [9] (w2)
|
|
|
c44fa3 |
-# Anew-2-2.noarch [10]
|
|
|
c44fa3 |
-#Rule #11:
|
|
|
c44fa3 |
-# !B-2-1.noarch [8] (w1)
|
|
|
c44fa3 |
-# A-2-1.noarch [6] (w2)
|
|
|
c44fa3 |
-# Anew-2-1.noarch [7]
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-#Choice Rule for #4:
|
|
|
c44fa3 |
-# !B-2-2.noarch [11] (w1)
|
|
|
c44fa3 |
-# A-2-2.noarch [9] (w2)
|
|
|
c44fa3 |
-#Choice Rule for #11
|
|
|
c44fa3 |
-# !B-2-1.noarch [8] (w1)
|
|
|
c44fa3 |
-# A-2-1.noarch [6] (w2)
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
repo system 0 testtags <inline>
|
|
|
c44fa3 |
#>=Pkg: A 1 1 noarch
|
|
|
c44fa3 |
#>=Prv: libA = 1-1
|
|
|
c44fa3 |
diff --git a/test/testcases/choicerules/choice5.t b/test/testcases/choicerules/choice5.t
|
|
|
c44fa3 |
deleted file mode 100644
|
|
|
c44fa3 |
index 9f43c8a3..00000000
|
|
|
c44fa3 |
--- a/test/testcases/choicerules/choice5.t
|
|
|
c44fa3 |
+++ /dev/null
|
|
|
c44fa3 |
@@ -1,21 +0,0 @@
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-# test that a package split does not update unrelated packages
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-repo system 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: A 1 1 noarch
|
|
|
c44fa3 |
-#>=Prv: libA
|
|
|
c44fa3 |
-#>=Pkg: B 1 1 noarch
|
|
|
c44fa3 |
-#>=Req: libA
|
|
|
c44fa3 |
-repo available 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: A 1 1 noarch
|
|
|
c44fa3 |
-#>=Prv: libA
|
|
|
c44fa3 |
-#>=Pkg: A 2 1 noarch
|
|
|
c44fa3 |
-#>=Pkg: Asplit 2 1 noarch
|
|
|
c44fa3 |
-#>=Prv: libA
|
|
|
c44fa3 |
-#>=Pkg: B 2 1 noarch
|
|
|
c44fa3 |
-#>=Req: libA
|
|
|
c44fa3 |
-system i686 rpm system
|
|
|
c44fa3 |
-job update name A
|
|
|
c44fa3 |
-result transaction,problems <inline>
|
|
|
c44fa3 |
-#>install Asplit-2-1.noarch@available
|
|
|
c44fa3 |
-#>upgrade A-1-1.noarch@system A-2-1.noarch@available
|
|
|
c44fa3 |
diff --git a/test/testcases/choicerules/choice6.t b/test/testcases/choicerules/choice6.t
|
|
|
c44fa3 |
deleted file mode 100644
|
|
|
c44fa3 |
index e860ae20..00000000
|
|
|
c44fa3 |
--- a/test/testcases/choicerules/choice6.t
|
|
|
c44fa3 |
+++ /dev/null
|
|
|
c44fa3 |
@@ -1,28 +0,0 @@
|
|
|
c44fa3 |
-#Rule #4:
|
|
|
c44fa3 |
-# !php-fpm-7.2.24-1.noarch [5] (w1)
|
|
|
c44fa3 |
-# glibc-2.17-325.noarch [2]I (w2)
|
|
|
c44fa3 |
-# libcrypt-4.1.1-6.noarch [7]
|
|
|
c44fa3 |
-#=> no choice rule for #4
|
|
|
c44fa3 |
-#
|
|
|
c44fa3 |
-repo @System 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: glibc 2.17 325 noarch
|
|
|
c44fa3 |
-#>=Prv: libcrypt
|
|
|
c44fa3 |
-#>=Pkg: php 5.4.16 48 noarch
|
|
|
c44fa3 |
-repo available 0 testtags <inline>
|
|
|
c44fa3 |
-#>=Pkg: php 7.2.24 1 noarch
|
|
|
c44fa3 |
-#>=Rec: php-fpm = 7.2.24-1
|
|
|
c44fa3 |
-#>=Pkg: php-fpm 7.2.24 1 noarch
|
|
|
c44fa3 |
-#>=Req: libcrypt
|
|
|
c44fa3 |
-#>=Pkg: php-fpm 8.0.13 2 noarch
|
|
|
c44fa3 |
-#>=Req: libcrypt
|
|
|
c44fa3 |
-#>=Pkg: libcrypt 4.1.1 6 noarch
|
|
|
c44fa3 |
-#>=Req: libc
|
|
|
c44fa3 |
-#>=Pkg: glibc 2.28 181 noarch
|
|
|
c44fa3 |
-#>=Prv: libc
|
|
|
c44fa3 |
-system i686 rpm @System
|
|
|
c44fa3 |
-job update all packages
|
|
|
c44fa3 |
-result transaction,problems <inline>
|
|
|
c44fa3 |
-#>install libcrypt-4.1.1-6.noarch@available
|
|
|
c44fa3 |
-#>install php-fpm-7.2.24-1.noarch@available
|
|
|
c44fa3 |
-#>upgrade glibc-2.17-325.noarch@@System glibc-2.28-181.noarch@available
|
|
|
c44fa3 |
-#>upgrade php-5.4.16-48.noarch@@System php-7.2.24-1.noarch@available
|
|
|
c44fa3 |
--
|
|
|
c44fa3 |
2.38.1
|
|
|
c44fa3 |
|