summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-01-02 13:50:56 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-01-02 13:50:56 +0100
commitf3224a73ec718a5f4e4404cd716e4b7c2702bb8b (patch)
treeeb482e0dd8bbb81cc26926299747d47421271e05
parentfce726023f703c369ae030684e75ed03c7544d6b (diff)
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
-rw-r--r--apt-pkg/acquire-item.cc4
-rw-r--r--test/authReliability/sources.list.good2
-rwxr-xr-xtest/pre-upload-check.py7
3 files changed, 10 insertions, 3 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 54526ab05..fa48eeae9 100644
--- 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);
+ 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)
diff --git a/test/authReliability/sources.list.good b/test/authReliability/sources.list.good
new file mode 100644
index 000000000..2e9a4458a
--- /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 75a726808..ca44ec726 100755
--- 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
"""
- 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