test/authReliability/sources.list.good:

- add missing file to make the test/pre-upload-check.py work again
apt-pkg/acquire-item.cc:
- fix auth-reliable code when file:// uris are used
test/pre-upload-check.py:
- use the standard apt, not "../bin/apt-get" by default
- make the error messages more useful on test-failure

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 54526ab058909a1032419a74ba010b1b4c9c423f..fa48eeae933abc5c0ca0aef93995c1fd1a316c79 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -935,6 +935,9 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,
    else
    {
       RetrievalDone(Message);
    else
    {
       RetrievalDone(Message);

+      if (!Complete)
+         // Still more retrieving to do
+         return;

 
       if (SigFile == "")
       {
 
       if (SigFile == "")
       {


@@ -987,6 +990,7 @@ void pkgAcqMetaIndex::RetrievalDone(string Message)
       FinalFile += URItoFileName(RealURI);
       DestFile = FinalFile;
    }
       FinalFile += URItoFileName(RealURI);
       DestFile = FinalFile;
    }

+   Complete = true;

 }
 
 void pkgAcqMetaIndex::AuthDone(string Message)
 }
 
 void pkgAcqMetaIndex::AuthDone(string Message)

diff --git a/test/authReliability/sources.list.good b/test/authReliability/sources.list.good
new file mode 100644 (file)
index 0000000..2e9a445
--- /dev/null
+++ b/test/authReliability/sources.list.good
@@ -0,0 +1,2 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-ok/ /
+

diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
index 75a726808e6a9c1d647af8f4a9bc9e6213e177a5..ca44ec726640d122d9f6c3935bd88e3be85405f3 100755 (executable)
--- a/test/pre-upload-check.py
+++ b/test/pre-upload-check.py
@@ -21,7 +21,8 @@ class testAptAuthenticationReliability(unittest.TestCase):
     test if the spec https://wiki.ubuntu.com/AptAuthenticationReliability 
     is properly implemented
     """
     test if the spec https://wiki.ubuntu.com/AptAuthenticationReliability 
     is properly implemented
     """

-    apt = "../bin/apt-get"
+    #apt = "../bin/apt-get"
+    apt = "apt-get"

 
     def setUp(self):
         pass
 
     def setUp(self):
         pass


@@ -68,7 +69,7 @@ class testAptAuthenticationReliability(unittest.TestCase):
                    ] + apt_args,
                    stdout=stdout, stderr=stderr)
         self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"),
                    ] + apt_args,
                    stdout=stdout, stderr=stderr)
         self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"),

-                     "The gpg file disappeared, this should not happen")
+                     "The gpg file disappeared after a regular download, this should not happen")

         self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"),
                      "The Packages file disappeared, this should not happen")
         # test good is still good after non I-M-S hit and a previous files in lists/
         self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"),
                      "The Packages file disappeared, this should not happen")
         # test good is still good after non I-M-S hit and a previous files in lists/


@@ -82,7 +83,7 @@ class testAptAuthenticationReliability(unittest.TestCase):
                    ] + apt_args,
                    stdout=stdout, stderr=stderr)
         self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"),
                    ] + apt_args,
                    stdout=stdout, stderr=stderr)
         self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"),

-                     "The gpg file disappeared, this should not happen")
+                     "The gpg file disappeared after a I-M-S hit, this should not happen")

         self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"),
                      "The Packages file disappeared, this should not happen")
         # test good is still good after I-M-S hit
         self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"),
                      "The Packages file disappeared, this should not happen")
         # test good is still good after I-M-S hit