Parse command line arguments more extensibly

[git-cache] / test_git_cache.py

diff --git a/test_git_cache.py b/test_git_cache.py
index ecb11e8e19c9bfd7a1c3ddbab27dd2d5568bdc83..b7e0edeb149ff4d478d85f235f0ff7ed1ae17e3f 100644 (file)
--- a/test_git_cache.py
+++ b/test_git_cache.py
@@ -4,13 +4,22 @@ import shutil
 import subprocess
 import unittest
 
+from typing import Optional
+
 import git_cache
 
 
+def _setenv(var: str, value: Optional[str]) -> None:
+    if value is None:
+        del os.environ[var]
+    else:
+        os.environ[var] = value
+
+
 def _git(directory: str, *args: str) -> bytes:
     p = subprocess.run(['git', '-C', directory] + list(args),
                        stdout=subprocess.PIPE, check=True)
-    return p.stdout
+    return bytes(p.stdout)
 
 
 def _commit_file(
@@ -28,9 +37,14 @@ def _commit_file(
 class TestGitCache(unittest.TestCase):
 
     def setUp(self) -> None:
-        self.xdgcache = tempfile.TemporaryDirectory(prefix='git_cache_test-')
+        self.xdgcache = tempfile.TemporaryDirectory(
+            prefix='git_cache_test-cache-')
+        self.xdgdata = tempfile.TemporaryDirectory(
+            prefix='git_cache_test-data-')
         self.old_XDG_CACHE_HOME = os.environ.get('XDG_CACHE_HOME')
-        os.environ['XDG_CACHE_HOME'] = self.xdgcache.name
+        self.old_XDG_DATA_HOME = os.environ.get('XDG_DATA_HOME')
+        _setenv('XDG_CACHE_HOME', self.xdgcache.name)
+        _setenv('XDG_DATA_HOME', self.xdgdata.name)
 
         os.environ['GIT_AUTHOR_NAME'] = 'test_git_cache'
         os.environ['GIT_COMMITTER_NAME'] = 'test_git_cache'
@@ -45,10 +59,8 @@ class TestGitCache(unittest.TestCase):
         _commit_file(self.upstream, 'file', 'Contents', 'First commit')
 
     def tearDown(self) -> None:
-        if self.old_XDG_CACHE_HOME is None:
-            del os.environ['XDG_CACHE_HOME']
-        else:
-            os.environ['XDG_CACHE_HOME'] = self.old_XDG_CACHE_HOME
+        _setenv('XDG_CACHE_HOME', self.old_XDG_CACHE_HOME)
+        _setenv('XDG_DATA_HOME', self.old_XDG_DATA_HOME)
 
         self.tempdir.cleanup()
         self.xdgcache.cleanup()
@@ -159,6 +171,17 @@ class TestGitCache(unittest.TestCase):
         d = git_cache.ensure_rev_available(self.upstream, 'otherbranch', rev)
         self.assertEqual(_git(d, 'show', '%s:foofile' % rev), b'foo')
 
+    def test_catch_up(self) -> None:
+        _git(self.upstream, 'checkout', '-b', 'otherbranch')
+        _commit_file(self.upstream, 'foofile', 'foo', 'Foo')
+        rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
+        d = git_cache.ensure_rev_available(self.upstream, 'otherbranch', rev)
+        self.assertEqual(_git(d, 'show', '%s:foofile' % rev), b'foo')
+        _git(self.upstream, 'checkout', 'master')
+        _git(self.upstream, 'merge', '--ff-only', 'otherbranch')
+        d = git_cache.ensure_rev_available(self.upstream, 'master', rev)
+        self.assertEqual(_git(d, 'show', '%s:foofile' % rev), b'foo')
+
     def test_fetch_after_cache_deleted(self) -> None:
         d1, rev1 = git_cache.fetch(self.upstream, 'master')
         shutil.rmtree(d1)
@@ -187,6 +210,21 @@ class TestGitCache(unittest.TestCase):
         with self.assertRaises(Exception):
             git_cache.ensure_rev_available(self.upstream, 'master', rev)
 
+    def test_fetch_raises_on_amend_after_cache_deleted(self) -> None:
+        d, _ = git_cache.fetch(self.upstream, 'master')
+        shutil.rmtree(d)
+        _git(self.upstream, 'commit', '--amend', '-m', 'Amended')
+        with self.assertRaises(Exception):
+            git_cache.fetch(self.upstream, 'master')
+
+    def test_ensure_raises_on_amend_after_cache_deleted(self) -> None:
+        d, _ = git_cache.fetch(self.upstream, 'master')
+        shutil.rmtree(d)
+        _git(self.upstream, 'commit', '--amend', '-m', 'Amended')
+        rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
+        with self.assertRaises(Exception):
+            git_cache.ensure_rev_available(self.upstream, 'master', rev)
+
 
 if __name__ == '__main__':
     unittest.main()