Make sure any set global mailmap doesn't interfere with functional tests.

Author: sinclairtarget

test/functional/lib/cmd.rb

@@ -12,7 +12,7 @@ def initialize(exec_path, rundir)
     @rundir = rundir
   end
 
-  def run(*args, cache_home: nil, config_home: nil, n_procs: nil)
+  def run(*args, cache_home: nil, git_config_path: nil, n_procs: nil)
     env_hash = {}
 
     if cache_home
@@ -21,8 +21,11 @@ def run(*args, cache_home: nil, config_home: nil, n_procs: nil)
       env_hash['GIT_WHO_DISABLE_CACHE'] = '1'
     end
 
-    if config_home
-      env_hash['XDG_CONFIG_HOME'] = config_home.to_s
+    env_hash['GIT_CONFIG_SYSTEM'] = ''
+    if git_config_path
+      env_hash['GIT_CONFIG_GLOBAL'] = git_config_path.to_s
+    else
+      env_hash['GIT_CONFIG_GLOBAL'] = ''
     end
 
     unless n_procs.nil?

test/functional/mailmap_test.rb

@@ -65,9 +65,7 @@ def test_global_mailmap
     Dir.mktmpdir do |dir|
       dir = Pathname.new(dir)
       cache_home = dir / ".cache"
-      config_home = dir / ".config"
       cache_home.mkdir
-      config_home.mkdir
 
       # Try with no mailmap
       cmd = GitWho.new(GitWho.built_bin_path, BigRepo.path)
@@ -76,7 +74,6 @@ def test_global_mailmap
         '--csv',
         '-e',
         cache_home: cache_home,
-        config_home: config_home,
       )
       refute_empty(stdout_s)
 
@@ -86,7 +83,7 @@ def test_global_mailmap
       assert_equal data[3]['commits'], '110'
 
       # Try with mailmap, does it invalidate cache?
-      git_dir = config_home / "git"
+      git_dir = dir / "git"
       git_dir.mkdir
 
       mailmap_path = git_dir / ".mailmap"
@@ -100,7 +97,7 @@ def test_global_mailmap
         '--csv',
         '-e',
         cache_home: cache_home,
-        config_home: config_home,
+        git_config_path: git_config_path,
       )
       refute_empty(stdout_s)
 
@@ -117,7 +114,7 @@ def test_global_mailmap
         '--csv',
         '-e',
         cache_home: cache_home,
-        config_home: config_home,
+        git_config_path: git_config_path,
       )
       refute_empty(stdout_s)
 
@@ -132,9 +129,7 @@ def test_both_mailmap
     Dir.mktmpdir do |dir|
       dir = Pathname.new(dir)
       cache_home = dir / ".cache"
-      config_home = dir / ".config"
       cache_home.mkdir
-      config_home.mkdir
 
       # Try with no mailmap
       cmd = GitWho.new(GitWho.built_bin_path, BigRepo.path)
@@ -143,7 +138,6 @@ def test_both_mailmap
         '--csv',
         '-e',
         cache_home: cache_home,
-        config_home: config_home,
       )
       refute_empty(stdout_s)
 
@@ -164,7 +158,6 @@ def test_both_mailmap
         '--csv',
         '-e',
         cache_home: cache_home,
-        config_home: config_home,
       )
       refute_empty(stdout_s)
 
@@ -177,7 +170,7 @@ def test_both_mailmap
       assert_equal data[3]['commits'], '110'
 
       # Try with two mailmaps, does it invalidate cache?
-      git_dir = config_home / "git"
+      git_dir = dir / "git"
       git_dir.mkdir
 
       global_mailmap_path = git_dir / ".mailmap"
@@ -191,7 +184,7 @@ def test_both_mailmap
         '--csv',
         '-e',
         cache_home: cache_home,
-        config_home: config_home,
+        git_config_path: git_config_path,
       )
       refute_empty(stdout_s)
 
@@ -211,7 +204,7 @@ def test_both_mailmap
         '--csv',
         '-e',
         cache_home: cache_home,
-        config_home: config_home,
+        git_config_path: git_config_path,
       )
       refute_empty(stdout_s)
 
@@ -231,7 +224,6 @@ def test_both_mailmap
         '--csv',
         '-e',
         cache_home: cache_home,
-        config_home: config_home,
       )
       refute_empty(stdout_s)
 
@@ -250,11 +242,9 @@ def test_bad_configured_global_mailmap_path
     Dir.mktmpdir do |dir|
       dir = Pathname.new(dir)
       cache_home = dir / ".cache"
-      config_home = dir / ".config"
       cache_home.mkdir
-      config_home.mkdir
 
-      git_dir = config_home / "git"
+      git_dir = dir / "git"
       git_dir.mkdir
       mailmap_path = git_dir / ".mailmap"
       # NOTE: We aren't creating the file!
@@ -268,7 +258,7 @@ def test_bad_configured_global_mailmap_path
         '--csv',
         '-e',
         cache_home: cache_home,
-        config_home: config_home,
+        git_config_path: git_config_path,
       )
       refute_empty(stdout_s)