* test/libapt/globalerror_test.cc:

  - errno 0 has a different strerror on hurd, so generate the expected
    message dynamically instead of hardcoding 'Success' (Closes: #656530)

diff --git a/debian/changelog b/debian/changelog
index 299afcf540d4ab6bf61dd7d4aee8fb6d31091139..99c3a203272121857a81fc240098ad5f7037e564 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,12 @@ apt (0.8.16~exp12) experimental; urgency=low
       which generates malformed requests, thanks Mel Collins for the hint!
       (Closes: #646381)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 19 Jan 2012 23:43:03 +0100
+  [ Pino Toscano ]
+  * test/libapt/globalerror_test.cc:
+    - errno 0 has a different strerror on hurd, so generate the expected
+      message dynamically instead of hardcoding 'Success' (Closes: #656530)
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 20 Jan 2012 01:31:30 +0100
 
 apt (0.8.16~exp11) experimental; urgency=low
 

diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc
index 5d27414f97068f716d187a8e546c8c51a3b88830..72044d493ad2abf0774ef0d75f83491d3af3b9f7 100644 (file)
--- 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);