Break up check_channel_contents

diff --git a/pinch.py b/pinch.py
index e00bfd8cf0c43b1b2dda67d770668d5ebaf44041..1a97f5377fe4c063fb448f6aba16dc7ac5b3aca4 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -260,54 +260,73 @@ def git_fetch(v: Verification, channel: Channel) -> None:
     v.result(process.returncode == 0)
 
 
     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_commit],
+                           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_contents(v: Verification, channel: Channel) -> None:
     with tempfile.TemporaryDirectory() as channel_contents, \
             tempfile.TemporaryDirectory() as git_contents:
 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)
+        git_checkout(v, channel, git_contents)
+
+        compare_tarball_and_git(v, channel, channel_contents, git_contents)
+

         v.status('Removing temporary directories')
     v.ok()
 
         v.status('Removing temporary directories')
     v.ok()