diff options
author | Timo Teräs <timo.teras@iki.fi> | 2020-10-03 13:57:05 +0300 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2020-10-03 13:58:30 +0300 |
commit | 8a794021c42baf8e1c12ae5e8e8313b66443002e (patch) | |
tree | 095b91ef78e27d11ac8265487c91ad67d3a5d1dc /test | |
parent | c269e9c24da57ab1b69ad6c80e9a1cb52b2b67d2 (diff) | |
download | apk-tools-8a794021c42baf8e1c12ae5e8e8313b66443002e.tar.gz apk-tools-8a794021c42baf8e1c12ae5e8e8313b66443002e.tar.bz2 apk-tools-8a794021c42baf8e1c12ae5e8e8313b66443002e.tar.xz apk-tools-8a794021c42baf8e1c12ae5e8e8313b66443002e.zip |
commit: rephrase the error messages more understandable
fixes #10703
Diffstat (limited to 'test')
-rw-r--r-- | test/basic12.test | 2 | ||||
-rw-r--r-- | test/basic13.test | 2 | ||||
-rw-r--r-- | test/conflict2.test | 2 | ||||
-rw-r--r-- | test/error1.test | 2 | ||||
-rw-r--r-- | test/error2.test | 2 | ||||
-rw-r--r-- | test/error3.test | 2 | ||||
-rw-r--r-- | test/error4.test | 4 | ||||
-rw-r--r-- | test/error5.test | 2 | ||||
-rw-r--r-- | test/pinning11.test | 2 | ||||
-rw-r--r-- | test/provides10.test | 2 | ||||
-rw-r--r-- | test/provides11.test | 2 | ||||
-rw-r--r-- | test/provides12.test | 2 | ||||
-rw-r--r-- | test/provides5.test | 2 | ||||
-rw-r--r-- | test/provides6.test | 2 | ||||
-rw-r--r-- | test/provides7.test | 2 | ||||
-rw-r--r-- | test/provides9.test | 2 |
16 files changed, 17 insertions, 17 deletions
diff --git a/test/basic12.test b/test/basic12.test index f43b8ce..24b398c 100644 --- a/test/basic12.test +++ b/test/basic12.test @@ -6,7 +6,7 @@ --latest upgrade @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: b-2: masked in: --no-network satisfies: a-2[b] diff --git a/test/basic13.test b/test/basic13.test index 40f5bb6..4afdab7 100644 --- a/test/basic13.test +++ b/test/basic13.test @@ -5,6 +5,6 @@ --latest upgrade @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: a-2: breaks: world[a<2] diff --git a/test/conflict2.test b/test/conflict2.test index 38566b6..51e280e 100644 --- a/test/conflict2.test +++ b/test/conflict2.test @@ -2,7 +2,7 @@ --test-repo conflict.repo add a b>1 @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: b-2: breaks: a-1[!b>1] satisfies: world[b>1] diff --git a/test/error1.test b/test/error1.test index 9060be9..9134add 100644 --- a/test/error1.test +++ b/test/error1.test @@ -2,7 +2,7 @@ --test-repo complicated1.repo add a d>1.5 @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: d-2.0: breaks: b-1[d<2.0] satisfies: world[d>1.5] a-3[d>1.5] c-1[d>1.0] diff --git a/test/error2.test b/test/error2.test index db5f9c1..8483fb1 100644 --- a/test/error2.test +++ b/test/error2.test @@ -2,7 +2,7 @@ --test-repo complicated1.repo add a d<1.5 @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: d-1.0: breaks: c-1[d>1.0] satisfies: world[d<1.5] b-1[d<2.0] diff --git a/test/error3.test b/test/error3.test index 8dfdd82..ca576ac 100644 --- a/test/error3.test +++ b/test/error3.test @@ -2,7 +2,7 @@ --test-repo complicated1.repo add a !b @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: d-2.0: breaks: b-1[d<2.0] satisfies: a-3[d>1.5] c-1[d>1.0] diff --git a/test/error4.test b/test/error4.test index 050f42b..541ac0a 100644 --- a/test/error4.test +++ b/test/error4.test @@ -2,6 +2,6 @@ --test-repo complicated1.repo add a nonexistant @EXPECT -ERROR: unsatisfiable constraints: - nonexistant (missing): +ERROR: unable to select packages: + nonexistant (no such package): required by: world[nonexistant] diff --git a/test/error5.test b/test/error5.test index 4becb3d..575916f 100644 --- a/test/error5.test +++ b/test/error5.test @@ -2,7 +2,7 @@ --test-repo complicated1.repo add a>2 @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: d-2.0: breaks: b-1[d<2.0] satisfies: a-3[d>1.5] c-1[d>1.0] diff --git a/test/pinning11.test b/test/pinning11.test index c163956..7735b28 100644 --- a/test/pinning11.test +++ b/test/pinning11.test @@ -4,7 +4,7 @@ --test-world "a@testing" add c>=3 @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: c-3: masked in: @testing satisfies: world[c>=3] diff --git a/test/provides10.test b/test/provides10.test index ba8ab7b..c832b75 100644 --- a/test/provides10.test +++ b/test/provides10.test @@ -3,7 +3,7 @@ --test-repo provides.repo add conflicted-dep @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: conflicted-provider (virtual): provided by: conflicted-provider-a conflicted-provider-b diff --git a/test/provides11.test b/test/provides11.test index e9f806e..54c6b34 100644 --- a/test/provides11.test +++ b/test/provides11.test @@ -3,7 +3,7 @@ --test-repo provides.repo add conflicted-parent @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: conflicted-provider (virtual): provided by: conflicted-provider-a conflicted-provider-b diff --git a/test/provides12.test b/test/provides12.test index 1bee4f9..50eedae 100644 --- a/test/provides12.test +++ b/test/provides12.test @@ -2,7 +2,7 @@ --test-repo provides.repo add self-provide @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: self-provide-0.1: conflicts: self-provide-0.1[self-provide] satisfies: world[self-provide] diff --git a/test/provides5.test b/test/provides5.test index adcb91a..776ba47 100644 --- a/test/provides5.test +++ b/test/provides5.test @@ -2,7 +2,7 @@ --test-repo provides.repo add server-a server-b @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: server-a-1: conflicts: server-b-1[theservice=1] satisfies: world[server-a] diff --git a/test/provides6.test b/test/provides6.test index 649ae20..19d94ec 100644 --- a/test/provides6.test +++ b/test/provides6.test @@ -2,7 +2,7 @@ --test-repo provides.repo add app app2 @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: libfoo-1: conflicts: libfoo-2 satisfies: app-2[so:foo.so.1] diff --git a/test/provides7.test b/test/provides7.test index b654819..4c0f47e 100644 --- a/test/provides7.test +++ b/test/provides7.test @@ -2,7 +2,7 @@ --test-repo provides.repo add selfconflicting @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: selfconflicting-1: conflicts: selfconflicting-1[selfprovided=2] selfconflicting-1[selfprovided=3] diff --git a/test/provides9.test b/test/provides9.test index f85a367..ce45a15 100644 --- a/test/provides9.test +++ b/test/provides9.test @@ -2,7 +2,7 @@ --test-repo provides.repo add conflicted-provider @EXPECT -ERROR: unsatisfiable constraints: +ERROR: unable to select packages: conflicted-provider (virtual): provided by: conflicted-provider-a conflicted-provider-b |