summaryrefslogtreecommitdiff
path: root/test/libapt/globalerror_test.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-01-24 20:18:39 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-01-24 20:18:39 +0100
commit5b172c0263c12f1163cfa17170a9b0da917e782c (patch)
treea8a978b0ca1891c492c554c8c1d9cbf5c030b529 /test/libapt/globalerror_test.cc
parent76dbf3cee365788eb7291c96f06b73a3769946d6 (diff)
parent3102af74e7ffaab3f47741c05451ce7f0e3b38fe (diff)
merged from experimental
Diffstat (limited to 'test/libapt/globalerror_test.cc')
-rw-r--r--test/libapt/globalerror_test.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc
index 5d27414f9..72044d493 100644
--- a/test/libapt/globalerror_test.cc
+++ b/test/libapt/globalerror_test.cc
@@ -3,9 +3,12 @@
#include "assert.h"
#include <string>
#include <errno.h>
+#include <string.h>
int main(int argc,char *argv[])
{
+ std::string const textOfErrnoZero(strerror(0));
+
equals(_error->empty(), true);
equals(_error->PendingError(), false);
equals(_error->Notice("%s Notice", "A"), false);
@@ -80,7 +83,7 @@ int main(int argc,char *argv[])
equals(_error->PendingError(), true);
equals(_error->PopMessage(text), true);
equals(_error->PendingError(), false);
- equals(text, "Something horrible happend 2 times - errno (0: Success)");
+ equals(text, std::string("Something horrible happend 2 times - errno (0: ").append(textOfErrnoZero).append(")"));
equals(_error->empty(), true);
std::string longText;
@@ -92,7 +95,7 @@ int main(int argc,char *argv[])
equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happend", 2), false);
equals(_error->PopMessage(text), true);
- equals(text, std::string(longText).append(" horrible happend 2 times - errno (0: Success)"));
+ equals(text, std::string(longText).append(" horrible happend 2 times - errno (0: ").append(textOfErrnoZero).append(")"));
equals(_error->Warning("Репозиторий не обновлён и будут %d %s", 4, "test"), false);
equals(_error->PopMessage(text), false);