summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-07-13 12:47:05 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-08-10 17:27:18 +0200
commitfd23676e809b7fa87ae138cc22d2c683d212950e (patch)
treeb11da2587ec5bd22b1013f087c46f114f8d53d24 /test/integration
parent3707fd4faab3f2e2521263070b68fd0afaae2900 (diff)
bunch of micro-optimizations for depcache
DepCache functions are called a lot, so if we can squeeze some drops out of them for free we should do so. Takes also the opportunity to remove some whitespace errors from these functions. Git-Dch: Ignore
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-apt-cache24
-rwxr-xr-xtest/integration/test-apt-showlist-orgroup-in-recommends2
2 files changed, 13 insertions, 13 deletions
diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
index 97dc0f939..7da2ab71f 100755
--- a/test/integration/test-apt-cache
+++ b/test/integration/test-apt-cache
@@ -56,21 +56,21 @@ testsuccessequal " foo | 1 | file:$(readlink -f .)/aptarchive uns
testsuccessequal 'foo
Depends: bar
- |Recommends: <cool>
- Recommends: <cooler>
Conflicts: <foobar>
- Conflicts: <foobar:i386>' aptcache depends foo
+ Conflicts: <foobar:i386>
+ |Recommends: <cool>
+ Recommends: <cooler>' aptcache depends foo
testsuccessequal 'foo
Depends: bar
- Recommends: <cool>
Conflicts: <foobar>
- Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowOnlyFirstOr=1
+ Conflicts: <foobar:i386>
+ Recommends: <cool>' aptcache depends foo -o APT::Cache::ShowOnlyFirstOr=1
testsuccessequal 'foo
Depends: bar
- |Recommends: <cool> (>= 2)
- Recommends: <cooler> (<< 5)
Conflicts: <foobar>
- Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowVersion=1
+ Conflicts: <foobar:i386>
+ |Recommends: <cool> (>= 2)
+ Recommends: <cooler> (<< 5)' aptcache depends foo -o APT::Cache::ShowVersion=1
testsuccessequal 'foo
Depends: bar
Conflicts: <foobar>
@@ -82,20 +82,20 @@ testsuccessequal 'foo
Conflicts: <foobar:i386>' aptcache depends foo --important --no-depends --conflicts
testsuccessequal 'foo
Depends: bar
- |Recommends: <cool>
- Recommends: <cooler>
Conflicts: <foobar>
Conflicts: <foobar:i386>
+ |Recommends: <cool>
+ Recommends: <cooler>
bar
Depends: bar
Breaks: foo
Breaks: <foo:i386>
Replaces: foo
Replaces: <foo:i386>
-<cool>
-<cooler>
<foobar>
<foobar:i386>
+<cool>
+<cooler>
<foo:i386>' aptcache depends foo --recurse
testsuccessequal 'foo
Depends: bar
diff --git a/test/integration/test-apt-showlist-orgroup-in-recommends b/test/integration/test-apt-showlist-orgroup-in-recommends
index bce421ac4..929f7feb9 100755
--- a/test/integration/test-apt-showlist-orgroup-in-recommends
+++ b/test/integration/test-apt-showlist-orgroup-in-recommends
@@ -13,7 +13,7 @@ insertinstalledpackage 'ddd' 'all' '1'
insertpackage 'unstable' 'aaa' 'all' '1'
insertpackage 'unstable' 'ddd' 'all' '1'
insertpackage 'unstable' 'yyy' 'all' '1'
-insertpackage 'unstable' 'zzz' 'all' '1'
+insertpackage 'unstable' 'zzz' 'all' '1:1'
insertpackage 'unstable' 'simple' 'all' '1' 'Recommends: aaa, bbb
Suggests: ccc, ddd'
insertpackage 'unstable' 'orgroup' 'all' '1' 'Recommends: aaa | bbb