From b12bdeaf8acd050c5526ecc05526db70df5fd485 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 4 May 2018 19:56:41 +0200
Subject: Fix various typos reported by spellcheckers

Reported-By: codespell & spellintian
Gbp-Dch: Ignore
---
 test/integration/framework               | 2 +-
 test/integration/test-bug-762160-relpath | 4 ++--
 test/libapt/compareversion_test.cc       | 7 ++++---
 test/libapt/tagfile_test.cc              | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/integration/framework b/test/integration/framework
index 38a084302..854f2c439 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1318,7 +1318,7 @@ rewritesourceslist() {
 }
 
 # wait for up to 10s for a pid file to appear to avoid possible race
-# when a helper is started and dosn't write the PID quick enough
+# when a helper is started and doesn't write the PID quick enough
 waitforpidfile() {
         local PIDFILE="$1"
         for i in $(seq 10); do
diff --git a/test/integration/test-bug-762160-relpath b/test/integration/test-bug-762160-relpath
index 1e66fbbc3..6a800aa05 100755
--- a/test/integration/test-bug-762160-relpath
+++ b/test/integration/test-bug-762160-relpath
@@ -1,5 +1,5 @@
 #!/bin/sh
-# regresion test for bug #762160 where apt-get update fails when a 
+# regression test for bug #762160 where apt-get update fails when a
 # relative directory is given
 #
 set -e
@@ -14,4 +14,4 @@ setupaptarchive
 changetowebserver
 
 testsuccess aptget update -o Dir=./rootdir
-testsuccess aptget update -o Dir=./rootdir 
\ No newline at end of file
+testsuccess aptget update -o Dir=./rootdir
diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc
index ee469f785..012932286 100644
--- a/test/libapt/compareversion_test.cc
+++ b/test/libapt/compareversion_test.cc
@@ -37,19 +37,20 @@ static bool callDPKG(const char * const val, const char * const ref, char const
    if (Process == 0)
    {
       const char * args[] = {
-	 BIN_DIR "/dpkg",
+	 "dpkg",
 	 "--compare-versions",
 	 val,
 	 op,
 	 ref,
 	 nullptr
       };
-      execv(args[0], (char**) args);
+      execvp(args[0], (char**) args);
       exit(1);
    }
    int Ret;
    waitpid(Process, &Ret, 0);
-   return WIFEXITED(Ret) == true && WEXITSTATUS(Ret) == 0;
+   EXPECT_TRUE(WIFEXITED(Ret));
+   return WEXITSTATUS(Ret) == 0;
 }
 
 
diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc
index 98af31fe9..f455a8dcc 100644
--- a/test/libapt/tagfile_test.cc
+++ b/test/libapt/tagfile_test.cc
@@ -235,7 +235,7 @@ TEST(TagFileTest, Comments)
 "Source: foo\n"
 "#Package: foo\n"
 "Section: bar\n"
-"#Section: overriden\n"
+"#Section: overridden\n"
 "Priority: optional\n"
 "Build-Depends: debhelper,\n"
 "# apt-utils, (temporarily disabled)\n"
-- 
cgit v1.2.3