vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-11 06:24:04 +00:00
Code Issues Projects Releases Wiki Activity

Restore old function check_file.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-02-02 20:08:51 +04:00
parent 996fc445be
commit 0dd44f98b8
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/lib.py
+4 -1
View File
@@ -113,11 +113,14 @@ class BaseTest(object):
with open(os.path.join(os.environ["HOME"], ".aptly", path), "r") as f: with open(os.path.join(os.environ["HOME"], ".aptly", path), "r") as f:
return f.read() return f.read()
def check_file(self, path, gold_name, match_prepare=None): def check_file_contents(self, path, gold_name, match_prepare=None):
contents = self.read_file(path) contents = self.read_file(path)
self.verify_match(self.get_gold(gold_name), contents, match_prepare=match_prepare) self.verify_match(self.get_gold(gold_name), contents, match_prepare=match_prepare)
def check_file(self):
self.verify_match(self.get_gold(), open(self.checkedFile, "r").read())
def check_exists(self, path): def check_exists(self, path):
if not os.path.exists(os.path.join(os.environ["HOME"], ".aptly", path)): if not os.path.exists(os.path.join(os.environ["HOME"], ".aptly", path)):
raise Exception("path %s doesn't exist" % (path, )) raise Exception("path %s doesn't exist" % (path, ))
system/t06_publish/snapshot.py
+4 -4
View File
@@ -36,7 +36,7 @@ class PublishSnapshot1Test(BaseTest):
self.check_exists('public/pool/main/g/gnuplot/gnuplot-doc_4.6.1-1~maverick2_all.deb') self.check_exists('public/pool/main/g/gnuplot/gnuplot-doc_4.6.1-1~maverick2_all.deb')
# verify contents except of sums # verify contents except of sums
self.check_file('public/dists/maverick/Release', 'release', match_prepare=strip_processor) self.check_file_contents('public/dists/maverick/Release', 'release', match_prepare=strip_processor)
# verify signatures # verify signatures
self.run_cmd(["gpg", "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')]) self.run_cmd(["gpg", "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')])
@@ -103,7 +103,7 @@ class PublishSnapshot2Test(BaseTest):
self.check_exists('public/pool/main/g/gnuplot/gnuplot-doc_4.6.1-1~maverick2_all.deb') self.check_exists('public/pool/main/g/gnuplot/gnuplot-doc_4.6.1-1~maverick2_all.deb')
# verify contents except of sums # verify contents except of sums
self.check_file('public/dists/squeeze/Release', 'release', match_prepare=strip_processor) self.check_file_contents('public/dists/squeeze/Release', 'release', match_prepare=strip_processor)
class PublishSnapshot3Test(BaseTest): class PublishSnapshot3Test(BaseTest):
@@ -135,7 +135,7 @@ class PublishSnapshot3Test(BaseTest):
self.check_exists('public/pool/contrib/g/gnuplot/gnuplot-doc_4.6.1-1~maverick2_all.deb') self.check_exists('public/pool/contrib/g/gnuplot/gnuplot-doc_4.6.1-1~maverick2_all.deb')
# verify contents except of sums # verify contents except of sums
self.check_file('public/dists/squeeze/Release', 'release', match_prepare=strip_processor) self.check_file_contents('public/dists/squeeze/Release', 'release', match_prepare=strip_processor)
class PublishSnapshot4Test(BaseTest): class PublishSnapshot4Test(BaseTest):
@@ -167,7 +167,7 @@ class PublishSnapshot4Test(BaseTest):
self.check_exists('public/pool/main/g/gnuplot/gnuplot-doc_4.6.1-1~maverick2_all.deb') self.check_exists('public/pool/main/g/gnuplot/gnuplot-doc_4.6.1-1~maverick2_all.deb')
# verify contents except of sums # verify contents except of sums
self.check_file('public/dists/squeeze/Release', 'release', match_prepare=strip_processor) self.check_file_contents('public/dists/squeeze/Release', 'release', match_prepare=strip_processor)
class PublishSnapshot5Test(BaseTest): class PublishSnapshot5Test(BaseTest):