TST: Try not to fail after rename

HaoZeke · Feb 1, 2024 · a03fb3e · a03fb3e
1 parent 53e12c4
commit a03fb3e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/asv/repo.py b/asv/repo.py
@@ -230,7 +230,7 @@ class NoRepository(Repo):
     """
 
     dvcs = "none"
-    _default_branch = "main"
+    _default_branch = "master"
 
     def __init__(self, url=None, path=None):
         self.url = None

diff --git a/asv/util.py b/asv/util.py
@@ -1279,8 +1279,8 @@ def git_default_branch():
                     [which('git'), 'config', '--system', 'init.defaultBranch'],
                     display_error=False).strip()
             except ProcessError:
-                # Default to main when global and system are not set
-                default_branch = 'main'
+                # Default to master when global and system are not set
+                default_branch = 'master'
     return default_branch
 
 

diff --git a/test/conftest.py b/test/conftest.py
@@ -150,7 +150,7 @@ def two_branch_repo_case(request, tmpdir):
         |
         | o  Revision 5 (stable)
         | |
-        | o  Merge main
+        | o  Merge master
         |/|
         o |  Revision 4
         | |
@@ -166,30 +166,30 @@ def two_branch_repo_case(request, tmpdir):
     dvcs_type = request.param
     tmpdir = str(tmpdir)
     if dvcs_type == "git":
-        main = f"{util.git_default_branch()}"
+        master = f"{util.git_default_branch()}"
     elif dvcs_type == "hg":
-        main = "default"
+        master = "default"
     dvcs = tools.generate_repo_from_ops(tmpdir, dvcs_type, [
         ("commit", 1),
-        ("checkout", "stable", main),
+        ("checkout", "stable", master),
         ("commit", 2),
-        ("checkout", main),
+        ("checkout", master),
         ("commit", 3),
         ("merge", "stable"),
         ("commit", 4),
         ("checkout", "stable"),
-        ("merge", main, "Merge main"),
+        ("merge", master, "Merge master"),
         ("commit", 5),
-        ("checkout", main),
+        ("checkout", master),
         ("commit", 6),
     ])
 
     conf = config.Config()
-    conf.branches = [main, "stable"]
+    conf.branches = [master, "stable"]
     conf.repo = dvcs.path
     conf.project = join(tmpdir, "repo")
     r = repo.get_repo(conf)
-    return dvcs, main, r, conf
+    return dvcs, master, r, conf
 
 
 @pytest.fixture
@@ -354,7 +354,7 @@ def benchmarks_fixture(tmpdir):
     d['env_dir'] = "env"
     d['benchmark_dir'] = 'benchmark'
     d['repo'] = tools.generate_test_repo(tmpdir, [0]).path
-    d['branches'] = ["main"]
+    d['branches'] = ["master"]
     conf = config.Config.from_json(d)
 
     repo = get_repo(conf)

diff --git a/test/test_repo.py b/test/test_repo.py
@@ -215,7 +215,7 @@ def test_get_branch_commits(two_branch_repo_case):
         ],
         "stable": [
             "Revision 5",
-            "Merge main",
+            "Merge master",
             "Revision 2",
             "Revision 1",
         ],
@@ -230,18 +230,18 @@ def test_get_branch_commits(two_branch_repo_case):
 
 @pytest.mark.parametrize("existing, expected", [
     # No existing commit, we expect all commits in commit order,
-    # main branch first
+    # master branch first
     ([], ["Revision 6", "Revision 4", "Merge stable", "Revision 3",
-          "Revision 1", "Revision 5", "Merge main", "Revision 2"]),
+          "Revision 1", "Revision 5", "Merge master", "Revision 2"]),
 
     # New commits on each branch
-    (["Revision 4", "Merge main"], ["Revision 6", "Revision 5"]),
+    (["Revision 4", "Merge master"], ["Revision 6", "Revision 5"]),
 
     # No new commits
     (["Revision 6", "Revision 5"], []),
 
     # Missing all commits on one branch (case of new branch added in config)
-    (["Revision 6"], ["Revision 5", "Merge main", "Revision 2", "Revision 1"]),
+    (["Revision 6"], ["Revision 5", "Merge master", "Revision 2", "Revision 1"]),
 ], ids=["all", "new", "no-new", "new-branch-added-in-config"])
 def test_get_new_branch_commits(two_branch_repo_case, existing, expected):
     dvcs, main, r, conf = two_branch_repo_case

diff --git a/test/test_workflow.py b/test/test_workflow.py
@@ -106,7 +106,7 @@ def test_run_publish(capfd, basic_conf):
     filename = glob.glob(join(tmpdir, 'html', 'graphs', 'arch-x86_64',
                               'asv_dummy_test_package_1',
                               'asv_dummy_test_package_2-' + tools.DUMMY2_VERSIONS[1],
-                              'branch-main',
+                              'branch-master',
                               'cpu-Blazingly fast',
                               'env-SOME_TEST_VAR-1',
                               'machine-orangutan',