X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/dc038df02de3df877d535f1c978ad7537eaf70a8..61aaf7990f91c97019b68a12595a167086fcc8e2:/pinch.py diff --git a/pinch.py b/pinch.py index e00bfd8..ec6e8b5 100644 --- a/pinch.py +++ b/pinch.py @@ -1,3 +1,4 @@ +import configparser import filecmp import functools import hashlib @@ -6,6 +7,7 @@ import os import os.path import shutil import subprocess +import sys import tempfile import types import urllib.parse @@ -130,8 +132,8 @@ def parse_channel(v: Verification, channel: Channel) -> None: v.status('Extracting git commit:') git_commit_node = d.getElementsByTagName('tt')[0] - channel.git_commit = git_commit_node.firstChild.nodeValue - v.status(channel.git_commit) + channel.git_revision = git_commit_node.firstChild.nodeValue + v.status(channel.git_revision) v.ok() v.status('Verifying git commit label') v.result(git_commit_node.previousSibling.nodeValue == 'Git commit ') @@ -203,7 +205,7 @@ def fetch_resources(v: Verification, channel: Channel) -> None: v.status('Verifying git commit on main page matches git commit in table') v.result( open( - channel.table['git-revision'].file).read(999) == channel.git_commit) + channel.table['git-revision'].file).read(999) == channel.git_revision) def git_fetch(v: Verification, channel: Channel) -> None: @@ -226,7 +228,7 @@ def git_fetch(v: Verification, channel: Channel) -> None: v.status('Checking if we already have this rev:') process = subprocess.run( - ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_commit]) + ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_revision]) if process.returncode == 0: v.status('yes') if process.returncode == 1: @@ -246,7 +248,7 @@ def git_fetch(v: Verification, channel: Channel) -> None: v.result(process.returncode == 0) v.status('Verifying that fetch retrieved this rev') process = subprocess.run( - ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_commit]) + ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_revision]) v.result(process.returncode == 0) v.status('Verifying rev is an ancestor of ref') @@ -255,68 +257,113 @@ def git_fetch(v: Verification, channel: Channel) -> None: channel.git_cachedir, 'merge-base', '--is-ancestor', - channel.git_commit, + channel.git_revision, channel.git_ref]) v.result(process.returncode == 0) +def compare_tarball_and_git( + v: Verification, + channel: Channel, + channel_contents: str, + git_contents: str) -> None: + v.status('Comparing channel tarball with git checkout') + match, mismatch, errors = compare(os.path.join( + channel_contents, channel.release_name), git_contents) + v.ok() + v.check('%d files match' % len(match), len(match) > 0) + v.check('%d files differ' % len(mismatch), len(mismatch) == 0) + expected_errors = [ + '.git-revision', + '.version-suffix', + 'nixpkgs', + 'programs.sqlite', + 'svn-revision'] + benign_errors = [] + for ee in expected_errors: + if ee in errors: + errors.remove(ee) + benign_errors.append(ee) + v.check( + '%d unexpected incomparable files' % + len(errors), + len(errors) == 0) + v.check( + '(%d of %d expected incomparable files)' % + (len(benign_errors), + len(expected_errors)), + len(benign_errors) == len(expected_errors)) + + +def extract_tarball(v: Verification, channel: Channel, dest: str) -> None: + v.status('Extracting tarball %s' % + channel.table['nixexprs.tar.xz'].file) + shutil.unpack_archive( + channel.table['nixexprs.tar.xz'].file, + dest) + v.ok() + + +def git_checkout(v: Verification, channel: Channel, dest: str) -> None: + v.status('Checking out corresponding git revision') + git = subprocess.Popen(['git', + '-C', + channel.git_cachedir, + 'archive', + channel.git_revision], + stdout=subprocess.PIPE) + tar = subprocess.Popen( + ['tar', 'x', '-C', dest, '-f', '-'], stdin=git.stdout) + git.stdout.close() + tar.wait() + git.wait() + v.result(git.returncode == 0 and tar.returncode == 0) + + +def check_channel_metadata( + v: Verification, + channel: Channel, + channel_contents: str) -> None: + v.status('Verifying git commit in channel tarball') + v.result( + open( + os.path.join( + channel_contents, + channel.release_name, + '.git-revision')).read(999) == channel.git_revision) + + v.status( + 'Verifying version-suffix is a suffix of release name %s:' % + channel.release_name) + version_suffix = open( + os.path.join( + channel_contents, + channel.release_name, + '.version-suffix')).read(999) + v.status(version_suffix) + v.result(channel.release_name.endswith(version_suffix)) + + def check_channel_contents(v: Verification, channel: Channel) -> None: with tempfile.TemporaryDirectory() as channel_contents, \ tempfile.TemporaryDirectory() as git_contents: - v.status('Extracting tarball %s' % - channel.table['nixexprs.tar.xz'].file) - shutil.unpack_archive( - channel.table['nixexprs.tar.xz'].file, - channel_contents) - v.ok() - v.status('Checking out corresponding git revision') - git = subprocess.Popen(['git', - '-C', - channel.git_cachedir, - 'archive', - channel.git_commit], - stdout=subprocess.PIPE) - tar = subprocess.Popen( - ['tar', 'x', '-C', git_contents, '-f', '-'], stdin=git.stdout) - git.stdout.close() - tar.wait() - git.wait() - v.result(git.returncode == 0 and tar.returncode == 0) - v.status('Comparing channel tarball with git checkout') - match, mismatch, errors = compare(os.path.join( - channel_contents, channel.release_name), git_contents) - v.ok() - v.check('%d files match' % len(match), len(match) > 0) - v.check('%d files differ' % len(mismatch), len(mismatch) == 0) - expected_errors = [ - '.git-revision', - '.version-suffix', - 'nixpkgs', - 'programs.sqlite', - 'svn-revision'] - benign_errors = [] - for ee in expected_errors: - if ee in errors: - errors.remove(ee) - benign_errors.append(ee) - v.check( - '%d unexpected incomparable files' % - len(errors), - len(errors) == 0) - v.check( - '(%d of %d expected incomparable files)' % - (len(benign_errors), - len(expected_errors)), - len(benign_errors) == len(expected_errors)) + + extract_tarball(v, channel, channel_contents) + check_channel_metadata(v, channel, channel_contents) + + git_checkout(v, channel, git_contents) + + compare_tarball_and_git(v, channel, channel_contents, git_contents) + v.status('Removing temporary directories') v.ok() -def main() -> None: +def main(argv: List[str]) -> None: v = Verification() - channel = Channel(url='https://channels.nixos.org/nixos-20.03', - git_repo='https://github.com/NixOS/nixpkgs.git', - git_ref='nixos-20.03') + config = configparser.ConfigParser() + config.read_file(open(argv[1]), argv[1]) + channel = Channel(**dict(config['nixos'].items())) fetch(v, channel) parse_channel(v, channel) fetch_resources(v, channel) @@ -325,4 +372,4 @@ def main() -> None: print(channel) -main() +main(sys.argv)