Browse Source

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
tags/debian/0.7.24ubuntu1
Michael Vogt 14 years ago
parent
commit
f3224a73ec
3 changed files with 10 additions and 3 deletions
  1. +4
    -0
      apt-pkg/acquire-item.cc
  2. +2
    -0
      test/authReliability/sources.list.good
  3. +4
    -3
      test/pre-upload-check.py

+ 4
- 0
apt-pkg/acquire-item.cc View File

@@ -935,6 +935,9 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,
else
{
RetrievalDone(Message);
if (!Complete)
// Still more retrieving to do
return;

if (SigFile == "")
{
@@ -987,6 +990,7 @@ void pkgAcqMetaIndex::RetrievalDone(string Message)
FinalFile += URItoFileName(RealURI);
DestFile = FinalFile;
}
Complete = true;
}

void pkgAcqMetaIndex::AuthDone(string Message)


+ 2
- 0
test/authReliability/sources.list.good View File

@@ -0,0 +1,2 @@
deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-ok/ /


+ 4
- 3
test/pre-upload-check.py View File

@@ -21,7 +21,8 @@ class testAptAuthenticationReliability(unittest.TestCase):
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
@@ -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"),
"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/
@@ -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"),
"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


Loading…
Cancel
Save