projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: Avoid use of /proc/self/fd
[apt.git]
/
test
/
integration
/
test-bug-612557-garbage-upgrade
diff --git
a/test/integration/test-bug-612557-garbage-upgrade
b/test/integration/test-bug-612557-garbage-upgrade
index 8efd1687acc311ec336bec7530f1948f4bffc4f8..d232c441212730fa325e63337a5c434fdff08107 100755
(executable)
--- a/
test/integration/test-bug-612557-garbage-upgrade
+++ b/
test/integration/test-bug-612557-garbage-upgrade
@@
-1,8
+1,8
@@
#!/bin/sh
set -e
#!/bin/sh
set -e
-TESTDIR=
$(readlink -f $(dirname $0))
-.
$TESTDIR/framework
+TESTDIR=
"$(readlink -f "$(dirname "$0")")"
+.
"$TESTDIR/framework"
setupenvironment
configarchitecture "i386"
setupenvironment
configarchitecture "i386"
@@
-13,14
+13,14
@@
insertpackage 'unstable' 'libreoffice-common' 'all' '1:3.3.0-2' 'Conflicts: open
setupaptarchive
touch rootdir/var/lib/apt/extended_states
setupaptarchive
touch rootdir/var/lib/apt/extended_states
-aptmark markauto python-uno openoffice.org-common
+
testsuccess
aptmark markauto python-uno openoffice.org-common
#aptmark unmarkauto openoffice.org-emailmerge
testmarkedauto python-uno openoffice.org-common
#aptmark unmarkauto openoffice.org-emailmerge
testmarkedauto python-uno openoffice.org-common
-testequal 'Reading package lists...
+test
failure
equal 'Reading package lists...
Building dependency tree...
Reading state information...
Building dependency tree...
Reading state information...
-The following
extra
packages will be installed:
+The following
additional
packages will be installed:
libreoffice-common
The following packages will be REMOVED:
openoffice.org-common openoffice.org-emailmerge
libreoffice-common
The following packages will be REMOVED:
openoffice.org-common openoffice.org-emailmerge
@@
-32,13
+32,13
@@
The following packages will be upgraded:
After this operation, 53.2 MB disk space will be freed.
E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
After this operation, 53.2 MB disk space will be freed.
E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
-aptmark markauto openoffice.org-emailmerge
+
testsuccess
aptmark markauto openoffice.org-emailmerge
testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge
testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge
-testequal 'Reading package lists...
+test
failure
equal 'Reading package lists...
Building dependency tree...
Reading state information...
Building dependency tree...
Reading state information...
-The following
extra
packages will be installed:
+The following
additional
packages will be installed:
libreoffice-common
The following packages will be REMOVED:
openoffice.org-common openoffice.org-emailmerge
libreoffice-common
The following packages will be REMOVED:
openoffice.org-common openoffice.org-emailmerge
@@
-50,7
+50,7
@@
The following packages will be upgraded:
After this operation, 53.2 MB disk space will be freed.
E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
After this operation, 53.2 MB disk space will be freed.
E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
-testequal 'Reading package lists...
+test
failure
equal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
Building dependency tree...
Reading state information...
The following packages will be REMOVED: