From: Scott Worley <scottworley@scottworley.com>
Date: Fri, 9 Jul 2021 22:59:59 +0000 (-0700)
Subject: Switch branch name used in tests: master → main
X-Git-Tag: v1.4.1~1
X-Git-Url: http://git.scottworley.com/git-cache/commitdiff_plain/fc9c09b3cad8def4df7603bfe8a18f9453f911aa?ds=sidebyside

Switch branch name used in tests: master → main
---

diff --git a/test_git_cache.py b/test_git_cache.py
index 7cd232d..ce80fcb 100644
--- a/test_git_cache.py
+++ b/test_git_cache.py
@@ -56,7 +56,7 @@ class TestGitCache(unittest.TestCase):
 
         self.tempdir = tempfile.TemporaryDirectory(prefix='git_cache_test-')
         self.upstream = os.path.join(self.tempdir.name, 'upstream')
-        subprocess.run(['git', '-c', 'init.defaultBranch=master',
+        subprocess.run(['git', '-c', 'init.defaultBranch=main',
                        'init', self.upstream], check=True)
         _commit_file(self.upstream, 'file', 'Contents', 'First commit')
 
@@ -68,80 +68,80 @@ class TestGitCache(unittest.TestCase):
         self.xdgcache.cleanup()
 
     def test_fetch(self) -> None:
-        d, rev = git_cache.fetch(self.upstream, 'master')
+        d, rev = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(_git(d, 'show', '%s:file' % rev), b'Contents')
 
     def test_fetch_twice(self) -> None:
-        d1, rev1 = git_cache.fetch(self.upstream, 'master')
+        d1, rev1 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(_git(d1, 'show', '%s:file' % rev1), b'Contents')
-        d2, rev2 = git_cache.fetch(self.upstream, 'master')
+        d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertEqual(rev1, rev2)
         self.assertEqual(_git(d2, 'show', '%s:file' % rev2), b'Contents')
 
     def test_fetch_then_ensure(self) -> None:
-        d1, rev = git_cache.fetch(self.upstream, 'master')
+        d1, rev = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(_git(d1, 'show', '%s:file' % rev), b'Contents')
-        d2 = git_cache.ensure_rev_available(self.upstream, 'master', rev)
+        d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev)
         self.assertEqual(d1, d2)
         self.assertEqual(_git(d2, 'show', '%s:file' % rev), b'Contents')
 
     def test_ensure_then_fetch(self) -> None:
         rev1 = _git(
             self.upstream, 'log', '--format=%H', '-n1').strip().decode()
-        d1 = git_cache.ensure_rev_available(self.upstream, 'master', rev1)
+        d1 = git_cache.ensure_rev_available(self.upstream, 'main', rev1)
         self.assertEqual(_git(d1, 'show', '%s:file' % rev1), b'Contents')
-        d2, rev2 = git_cache.fetch(self.upstream, 'master')
+        d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertEqual(rev1, rev2)
         self.assertEqual(_git(d2, 'show', '%s:file' % rev2), b'Contents')
 
     def test_fetch_new_file(self) -> None:
-        d1, rev1 = git_cache.fetch(self.upstream, 'master')
+        d1, rev1 = git_cache.fetch(self.upstream, 'main')
         _commit_file(self.upstream, 'foofile', 'foo', 'Foo')
-        d2, rev2 = git_cache.fetch(self.upstream, 'master')
+        d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertNotEqual(rev1, rev2)
         self.assertEqual(_git(d2, 'show', '%s:foofile' % rev2), b'foo')
 
     def test_ensure_doesnt_fetch_new_file(self) -> None:
-        d1, rev1 = git_cache.fetch(self.upstream, 'master')
+        d1, rev1 = git_cache.fetch(self.upstream, 'main')
         _commit_file(self.upstream, 'foofile', 'foo', 'Foo')
         rev2 = _git(
             self.upstream, 'log', '--format=%H', '-n1').strip().decode()
         self.assertNotEqual(rev1, rev2)
-        d2 = git_cache.ensure_rev_available(self.upstream, 'master', rev1)
+        d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev1)
         self.assertEqual(d1, d2)
         p = subprocess.run(
             ['git', '-C', d2, 'show', '%s:foofile' % rev2], check=False)
         self.assertNotEqual(p.returncode, 0)
 
     def test_ensure_doesnt_fetch_from_deleted_upstream(self) -> None:
-        d1, rev = git_cache.fetch(self.upstream, 'master')
+        d1, rev = git_cache.fetch(self.upstream, 'main')
         self.tempdir.cleanup()
-        d2 = git_cache.ensure_rev_available(self.upstream, 'master', rev)
+        d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev)
         self.assertEqual(d1, d2)
 
     def test_ensure_fetches_new_file(self) -> None:
-        d1, rev1 = git_cache.fetch(self.upstream, 'master')
+        d1, rev1 = git_cache.fetch(self.upstream, 'main')
         _commit_file(self.upstream, 'foofile', 'foo', 'Foo')
         rev2 = _git(
             self.upstream, 'log', '--format=%H', '-n1').strip().decode()
         self.assertNotEqual(rev1, rev2)
-        d2 = git_cache.ensure_rev_available(self.upstream, 'master', rev2)
+        d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev2)
         self.assertEqual(d1, d2)
         self.assertEqual(_git(d2, 'show', '%s:foofile' % rev2), b'foo')
 
     def test_fetch_raises_on_invalid_repo(self) -> None:
         self.tempdir.cleanup()
         with self.assertRaises(Exception):
-            git_cache.fetch(self.upstream, 'master')
+            git_cache.fetch(self.upstream, 'main')
 
     def test_ensure_raises_on_invalid_repo(self) -> None:
         rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
         self.tempdir.cleanup()
         with self.assertRaises(Exception):
-            git_cache.ensure_rev_available(self.upstream, 'master', rev)
+            git_cache.ensure_rev_available(self.upstream, 'main', rev)
 
     def test_fetch_raises_on_invalid_ref(self) -> None:
         with self.assertRaises(Exception):
@@ -164,7 +164,7 @@ class TestGitCache(unittest.TestCase):
         _commit_file(self.upstream, 'foofile', 'foo', 'Foo')
         rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
         with self.assertRaises(Exception):
-            git_cache.ensure_rev_available(self.upstream, 'master', rev)
+            git_cache.ensure_rev_available(self.upstream, 'main', rev)
 
     def test_ensure_other_branch(self) -> None:
         _git(self.upstream, 'checkout', '-b', 'otherbranch')
@@ -179,79 +179,79 @@ class TestGitCache(unittest.TestCase):
         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, 'checkout', 'main')
         _git(self.upstream, 'merge', '--ff-only', 'otherbranch')
-        d = git_cache.ensure_rev_available(self.upstream, 'master', rev)
+        d = git_cache.ensure_rev_available(self.upstream, 'main', 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')
+        d1, rev1 = git_cache.fetch(self.upstream, 'main')
         shutil.rmtree(d1)
-        d2, rev2 = git_cache.fetch(self.upstream, 'master')
+        d2, rev2 = git_cache.fetch(self.upstream, 'main')
         self.assertEqual(d1, d2)
         self.assertEqual(rev1, rev2)
         self.assertEqual(_git(d2, 'show', '%s:file' % rev2), b'Contents')
 
     def test_ensure_after_cache_deleted(self) -> None:
-        d1, rev = git_cache.fetch(self.upstream, 'master')
+        d1, rev = git_cache.fetch(self.upstream, 'main')
         shutil.rmtree(d1)
-        d2 = git_cache.ensure_rev_available(self.upstream, 'master', rev)
+        d2 = git_cache.ensure_rev_available(self.upstream, 'main', rev)
         self.assertEqual(d1, d2)
         self.assertEqual(_git(d2, 'show', '%s:file' % rev), b'Contents')
 
     def test_fetch_raises_on_amend(self) -> None:
-        git_cache.fetch(self.upstream, 'master')
+        git_cache.fetch(self.upstream, 'main')
         _git(self.upstream, 'commit', '--amend', '-m', 'Amended')
         with self.assertRaises(Exception):
-            git_cache.fetch(self.upstream, 'master')
+            git_cache.fetch(self.upstream, 'main')
 
     def test_ensure_raises_on_amend(self) -> None:
-        git_cache.fetch(self.upstream, 'master')
+        git_cache.fetch(self.upstream, 'main')
         _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)
+            git_cache.ensure_rev_available(self.upstream, 'main', rev)
 
     def test_fetch_raises_on_amend_after_cache_deleted(self) -> None:
-        d, _ = git_cache.fetch(self.upstream, 'master')
+        d, _ = git_cache.fetch(self.upstream, 'main')
         shutil.rmtree(d)
         _git(self.upstream, 'commit', '--amend', '-m', 'Amended')
         with self.assertRaises(Exception):
-            git_cache.fetch(self.upstream, 'master')
+            git_cache.fetch(self.upstream, 'main')
 
     def test_ensure_raises_on_amend_after_cache_deleted(self) -> None:
-        d, _ = git_cache.fetch(self.upstream, 'master')
+        d, _ = git_cache.fetch(self.upstream, 'main')
         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)
+            git_cache.ensure_rev_available(self.upstream, 'main', rev)
 
     def test_force_fetch_after_amend(self) -> None:
-        git_cache.fetch(self.upstream, 'master')
+        git_cache.fetch(self.upstream, 'main')
         _git(self.upstream, 'commit', '--amend', '-m', 'Amended')
-        git_cache.fetch(self.upstream, 'master', force=True)
+        git_cache.fetch(self.upstream, 'main', force=True)
 
     def test_force_ensure_after_amend(self) -> None:
-        git_cache.fetch(self.upstream, 'master')
+        git_cache.fetch(self.upstream, 'main')
         _git(self.upstream, 'commit', '--amend', '-m', 'Amended')
         rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
         git_cache.ensure_rev_available(
-            self.upstream, 'master', rev, force=True)
+            self.upstream, 'main', rev, force=True)
 
     def test_force_fetch_after_amend_and_cache_delete(self) -> None:
-        d, _ = git_cache.fetch(self.upstream, 'master')
+        d, _ = git_cache.fetch(self.upstream, 'main')
         shutil.rmtree(d)
         _git(self.upstream, 'commit', '--amend', '-m', 'Amended')
-        git_cache.fetch(self.upstream, 'master', force=True)
+        git_cache.fetch(self.upstream, 'main', force=True)
 
     def test_force_ensure_after_amend_and_cache_delete(self) -> None:
-        d, _ = git_cache.fetch(self.upstream, 'master')
+        d, _ = git_cache.fetch(self.upstream, 'main')
         shutil.rmtree(d)
         _git(self.upstream, 'commit', '--amend', '-m', 'Amended')
         rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
         git_cache.ensure_rev_available(
-            self.upstream, 'master', rev, force=True)
+            self.upstream, 'main', rev, force=True)
 
 
 if __name__ == '__main__':