summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-624218-Translation-file-handling
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-03-10 00:59:44 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-03-16 18:01:54 +0100
commit25b86db159fbc3c043628e285c0c1ef24dec2c6e (patch)
treeeee3860a1a0ff542959db83dcf8e7ffafad91bf1 /test/integration/test-bug-624218-Translation-file-handling
parentb209edfa318e89df31a2dcae82c3d72b48c1e77f (diff)
test exitcode as well as string equality
We use test{success,failure} now all over the place in the framework, so its only consequencial to do this in the situations in which we test for a specific output as well. Git-Dch: Ignore
Diffstat (limited to 'test/integration/test-bug-624218-Translation-file-handling')
-rwxr-xr-xtest/integration/test-bug-624218-Translation-file-handling17
1 files changed, 7 insertions, 10 deletions
diff --git a/test/integration/test-bug-624218-Translation-file-handling b/test/integration/test-bug-624218-Translation-file-handling
index 652386892..3987abff1 100755
--- a/test/integration/test-bug-624218-Translation-file-handling
+++ b/test/integration/test-bug-624218-Translation-file-handling
@@ -65,29 +65,27 @@ configallowinsecurerepositories "true";
msgtest 'Download of en as forced language' 'without Index'
testwarning --nomsg aptget update -o Acquire::Languages=en
-cp rootdir/tmp/testsuccess.output testsuccess.output
-testsuccess grep -q -e 'Translation-en ' testsuccess.output
+testsuccess grep -q -e 'Translation-en ' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of nothing else in forced language' 'without Index'
testwarning --nomsg aptget update -o Acquire::Languages=en
-testfailure grep -q -e 'Translation-[^e][^n] ' rootdir/tmp/testsuccess.output
+testfailure grep -q -e 'Translation-[^e][^n] ' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of ast_DE as forced language' 'without Index'
testwarning --nomsg aptget update -o Acquire::Languages=ast_DE
-cp rootdir/tmp/testsuccess.output testsuccess.output
-testsuccess grep -q -e 'Translation-ast_DE$' testsuccess.output
+testsuccess grep -q -e 'Translation-ast_DE$' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of nothing else in forced language' 'without Index'
testwarning --nomsg aptget update -o Acquire::Languages=ast_DE
-testfailure grep -q -e 'Translation-[^a][^s]' rootdir/tmp/testsuccess.output
+testfailure grep -q -e 'Translation-[^a][^s]' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of nothing if none is forced' 'without Index'
testwarning --nomsg aptget update -o Acquire::Languages=none
-testfailure grep -q -e 'Translation' rootdir/tmp/testsuccess.output
+testfailure grep -q -e 'Translation' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
mkdir -p rootdir/var/lib/apt/lists
@@ -95,8 +93,7 @@ touch rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_i18n_Translat
msgtest 'Download of builtin files' 'without Index'
testwarning --nomsg aptget update
-cp rootdir/tmp/testsuccess.output testsuccess.output
-testsuccess grep -q -e 'Translation-ast_DE' testsuccess.output
+testsuccess grep -q -e 'Translation-ast_DE' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
mkdir -p rootdir/var/lib/apt/lists
@@ -104,5 +101,5 @@ touch rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_i18n_Translat
msgtest 'Download of nothing (even builtin) if none is forced' 'without Index'
testwarning --nomsg aptget update -o Acquire::Languages=none
-testfailure grep -q -e 'Translation' rootdir/tmp/testsuccess.output
+testfailure grep -q -e 'Translation' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists