summaryrefslogtreecommitdiff
path: root/test/pre-upload-check.py
diff options
context:
space:
mode:
authorMichael Vogt <egon@bottom>2007-10-05 08:27:21 +0200
committerMichael Vogt <egon@bottom>2007-10-05 08:27:21 +0200
commit50e95852a7408d6188042a9c7923e42553722a2a (patch)
tree3c41d4f773ac5f4405056084b0e1a0a102509038 /test/pre-upload-check.py
parentff6bb5727e35159acd061f77cc462a741d2c978e (diff)
parentd6039f9e73d440f1e49ac880f5017cb6aaf4546e (diff)
- only send LastModified if we actually have a file
- delete zero size I-M-S hits
Diffstat (limited to 'test/pre-upload-check.py')
-rwxr-xr-xtest/pre-upload-check.py21
1 files changed, 19 insertions, 2 deletions
diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
index 2199c598a..373683360 100755
--- a/test/pre-upload-check.py
+++ b/test/pre-upload-check.py
@@ -72,7 +72,6 @@ class testAuthentication(unittest.TestCase):
call([self.apt,"update",
"-o","Dir::Etc::sourcelist=./%s" % f]+apt_args,
stdout=stdout, stderr=stderr)
- # then get the pkg
cmd = ["install", "-y", "-d", "--reinstall",
"%s=%s" % (self.pkg, self.pkgver),
"-o","Dir::state::Status=./fake-status"]
@@ -92,7 +91,9 @@ class testAuthentication(unittest.TestCase):
stdout=stdout, stderr=stderr)
self.assert_(res == expected_res,
"test '%s' failed (got %s expected %s" % (f,res,expected_res))
-
+ if expected_res == 0:
+ self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0,
+ "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*"))
class testLocalRepositories(unittest.TestCase):
@@ -119,6 +120,22 @@ class testLocalRepositories(unittest.TestCase):
self.assert_(os.path.exists(os.path.join(self.repo,"Packages.gz")),
"Packages.gz vanished from local repo")
+ def testLocalRepo2(self):
+ repo = os.path.abspath(os.path.join(os.getcwd(), self.repo_dir+"2"))
+ sources = os.path.join(self.repo, "sources.list")
+ s = open(sources,"w")
+ s.write("deb file://%s/ /\n" % repo)
+ s.close()
+
+ # two times to get at least one i-m-s hit
+ for i in range(2):
+ self.assert_(os.path.exists(sources))
+ cmd = [self.apt,"update","-o", "Dir::Etc::sourcelist=%s" % sources]+apt_args
+ res = call(cmd, stdout=stdout, stderr=stderr)
+ self.assertEqual(res, 0, "local repo2 test failed")
+ self.assert_(os.path.exists(os.path.join(repo,"Packages.gz")),
+ "Packages.gz vanished from local repo")
+
def testInstallFromLocalRepo(self):
apt = [self.apt,"-o", "Dir::Etc::sourcelist=%s"% self.sources]+apt_args
cmd = apt+["update"]