diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-06-14 21:37:38 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-06-14 21:37:38 +0300 |
| commit | ac0c7457c26dd4424ec6282293f3ebbcc1e63886 (patch) | |
| tree | 15eb440e00ee23448516055787631c58c5ec9431 /test | |
| parent | 56b623b9e21c1dddffaaa37cfb4aeaca27917cbe (diff) | |
| download | apk-tools-ac0c7457c26dd4424ec6282293f3ebbcc1e63886.tar.gz apk-tools-ac0c7457c26dd4424ec6282293f3ebbcc1e63886.tar.bz2 apk-tools-ac0c7457c26dd4424ec6282293f3ebbcc1e63886.tar.xz apk-tools-ac0c7457c26dd4424ec6282293f3ebbcc1e63886.zip | |
errors: detect self-conflicts properly
and add the provided version information to the conflicts.
fixes the final test case that was broken. hooray.
Diffstat (limited to 'test')
| -rw-r--r-- | test/provides5.test | 4 | ||||
| -rw-r--r-- | test/provides7.test | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/test/provides5.test b/test/provides5.test index fc21ae2..adcb91a 100644 --- a/test/provides5.test +++ b/test/provides5.test @@ -4,8 +4,8 @@ add server-a server-b @EXPECT ERROR: unsatisfiable constraints: server-a-1: - conflicts: server-b-1[theservice] + conflicts: server-b-1[theservice=1] satisfies: world[server-a] server-b-1: - conflicts: server-a-1[theservice] + conflicts: server-a-1[theservice=2] satisfies: world[server-b] diff --git a/test/provides7.test b/test/provides7.test index a7ac5ed..b654819 100644 --- a/test/provides7.test +++ b/test/provides7.test @@ -2,3 +2,8 @@ --test-repo provides.repo add selfconflicting @EXPECT +ERROR: unsatisfiable constraints: + selfconflicting-1: + conflicts: selfconflicting-1[selfprovided=2] + selfconflicting-1[selfprovided=3] + satisfies: world[selfconflicting] |