summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-06-12 13:24:07 +0300
committerTimo Teräs <timo.teras@iki.fi>2013-06-13 18:22:00 +0300
commite7fd4d03bfd430053cca5161846889d5e2b1e2a1 (patch)
tree8a8d45d2dd52d30990c52e498be01831b55c7c7c /test
parent426a12686e6e6dcce11616c774176c01ad0985f9 (diff)
downloadapk-tools-e7fd4d03bfd430053cca5161846889d5e2b1e2a1.tar.bz2
apk-tools-e7fd4d03bfd430053cca5161846889d5e2b1e2a1.tar.xz
solver: rewrite as deductive solver -- pinning support
Fix also pinning test cases to be more sane.
Diffstat (limited to 'test')
-rw-r--r--test/pinning-basic.repo20
-rw-r--r--test/pinning-overlay1.repo (renamed from test/pinning.repo)0
-rw-r--r--test/pinning-overlay2.repo (renamed from test/pinning.repo2)0
-rw-r--r--test/pinning-overlay3.repo8
-rw-r--r--test/pinning1.test4
-rw-r--r--test/pinning10.test4
-rw-r--r--test/pinning11.test8
-rw-r--r--test/pinning12.test10
-rw-r--r--test/pinning2.test4
-rw-r--r--test/pinning3.test4
-rw-r--r--test/pinning4.test4
-rw-r--r--test/pinning5.test6
-rw-r--r--test/pinning6.test6
-rw-r--r--test/pinning7.test6
-rw-r--r--test/pinning8.test6
-rw-r--r--test/pinning9.test4
16 files changed, 70 insertions, 24 deletions
diff --git a/test/pinning-basic.repo b/test/pinning-basic.repo
new file mode 100644
index 0000000..23a8c65
--- /dev/null
+++ b/test/pinning-basic.repo
@@ -0,0 +1,20 @@
+C:Q1eVpkasfqZAukAdFYbgwt4xffZWU=
+P:a
+V:2
+S:1
+I:1
+D:b
+
+C:Q1hdUpffv5mYgJEqW52UmVsv23ysE=
+P:b
+V:2
+S:1
+I:1
+
+C:Q1eVpkasfqZAukArrYbg324xAt4WU=
+P:c
+V:2
+S:1
+I:1
+D:a>=2
+
diff --git a/test/pinning.repo b/test/pinning-overlay1.repo
index c41ddf7..c41ddf7 100644
--- a/test/pinning.repo
+++ b/test/pinning-overlay1.repo
diff --git a/test/pinning.repo2 b/test/pinning-overlay2.repo
index 45c5114..45c5114 100644
--- a/test/pinning.repo2
+++ b/test/pinning-overlay2.repo
diff --git a/test/pinning-overlay3.repo b/test/pinning-overlay3.repo
new file mode 100644
index 0000000..90a4b43
--- /dev/null
+++ b/test/pinning-overlay3.repo
@@ -0,0 +1,8 @@
+C:Q1eVpkasfqZAukAffYsd324xAtxxU=
+P:iif
+V:3
+S:1
+I:1
+D:a b
+i:a
+
diff --git a/test/pinning1.test b/test/pinning1.test
index 3416cac..972f189 100644
--- a/test/pinning1.test
+++ b/test/pinning1.test
@@ -1,6 +1,6 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
add a
@EXPECT
(1/2) Installing b (2)
diff --git a/test/pinning10.test b/test/pinning10.test
index 31a01c2..f8f6763 100644
--- a/test/pinning10.test
+++ b/test/pinning10.test
@@ -1,6 +1,6 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
--test-instdb pinning.installed
--test-world "a@testing"
add a
diff --git a/test/pinning11.test b/test/pinning11.test
new file mode 100644
index 0000000..a3dd856
--- /dev/null
+++ b/test/pinning11.test
@@ -0,0 +1,8 @@
+@ARGS
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
+--test-world "a@testing"
+add c>=3
+@EXPECT
+ERROR: unsatisfiable dependencies:
+ c-3: not pinned: @testing
diff --git a/test/pinning12.test b/test/pinning12.test
new file mode 100644
index 0000000..746d3e4
--- /dev/null
+++ b/test/pinning12.test
@@ -0,0 +1,10 @@
+@ARGS
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
+--test-repo testing:pinning-overlay3.repo
+add a@testing
+@EXPECT
+(1/3) Installing b (2)
+(2/3) Installing a@testing (3)
+(3/3) Installing iif@testing (3)
+OK: 0 MiB in 0 packages
diff --git a/test/pinning2.test b/test/pinning2.test
index aa40250..969b89e 100644
--- a/test/pinning2.test
+++ b/test/pinning2.test
@@ -1,6 +1,6 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
add a@testing
@EXPECT
(1/2) Installing b (2)
diff --git a/test/pinning3.test b/test/pinning3.test
index c5666cc..6cfa82f 100644
--- a/test/pinning3.test
+++ b/test/pinning3.test
@@ -1,6 +1,6 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
add a@testing b@testing
@EXPECT
(1/2) Installing b@testing (3)
diff --git a/test/pinning4.test b/test/pinning4.test
index 49a852f..d7a0e06 100644
--- a/test/pinning4.test
+++ b/test/pinning4.test
@@ -1,6 +1,6 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
add c@testing
@EXPECT
(1/3) Installing b (2)
diff --git a/test/pinning5.test b/test/pinning5.test
index 17e58d0..a2880b2 100644
--- a/test/pinning5.test
+++ b/test/pinning5.test
@@ -1,7 +1,7 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo
---test-repo testing:pinning.repo2
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
+--test-repo testing:pinning-overlay2.repo
--test-instdb pinning.installed
--test-world "c@testing"
add
diff --git a/test/pinning6.test b/test/pinning6.test
index 5416c77..9780205 100644
--- a/test/pinning6.test
+++ b/test/pinning6.test
@@ -1,7 +1,7 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo
---test-repo testing:pinning.repo2
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
+--test-repo testing:pinning-overlay2.repo
--test-instdb pinning.installed
--test-world "c@testing"
upgrade
diff --git a/test/pinning7.test b/test/pinning7.test
index 42a3570..80a2541 100644
--- a/test/pinning7.test
+++ b/test/pinning7.test
@@ -1,7 +1,7 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo
---test-repo testing2:pinning.repo
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
+--test-repo testing2:pinning-overlay1.repo
--test-instdb pinning.installed
--test-world "c@testing"
add c@testing2
diff --git a/test/pinning8.test b/test/pinning8.test
index 84f312b..173669b 100644
--- a/test/pinning8.test
+++ b/test/pinning8.test
@@ -1,7 +1,7 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo2
---test-instdb pinning.installed2
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay2.repo
+--test-instdb pinning.installed
--test-world "c@testing"
upgrade -a
@EXPECT
diff --git a/test/pinning9.test b/test/pinning9.test
index e9836ff..e2d0010 100644
--- a/test/pinning9.test
+++ b/test/pinning9.test
@@ -1,6 +1,6 @@
@ARGS
---test-repo basic.repo
---test-repo testing:pinning.repo2
+--test-repo pinning-basic.repo
+--test-repo testing:pinning-overlay1.repo
--test-instdb pinning.installed2
--test-world "c@testing"
add