make a few more tests pass on osx.

Anthony Sottile · Anthony Sottile · commit aae98a0899ef · 2014-06-23T09:32:48.000-07:00
diff --git a/tests/commands/install_uninstall_test.py b/tests/commands/install_uninstall_test.py
@@ -149,7 +149,8 @@ def test_environment_not_sourced(tmpdir_factory):
 
         ret, stdout, stderr = local['git'].run(
             ['commit', '--allow-empty', '-m', 'foo'],
-            env={},
+            # XXX: 'HOME' makes this test pass on OSX
+            env={'HOME': os.environ['HOME']},
             retcode=None,
         )
         assert ret == 1
diff --git a/tests/repository_test.py b/tests/repository_test.py
@@ -180,7 +180,7 @@ def test_cwd_of_hook(tmpdir_factory, store):
     with local.cwd(path):
         _test_hook_repo(
             tmpdir_factory, store, 'prints_cwd_repo',
-            'prints_cwd', [], path + '\n',
+            'prints_cwd', ['-L'], path + '\n',
         )
 
 
@@ -284,7 +284,7 @@ def test_tags_on_repositories(in_tmpdir, tmpdir_factory, store):
     repo_1 = Repository.create(
         make_config_from_repo(git_dir_1, sha=tag), store,
     )
-    ret = repo_1.run_hook('prints_cwd', [])
+    ret = repo_1.run_hook('prints_cwd', ['-L'])
     assert ret[0] == 0
     assert ret[1].strip() == in_tmpdir
 

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,8 @@ def test_environment_not_sourced(tmpdir_factory):`
`149`	`149`
`150`	`150`	`ret, stdout, stderr = local['git'].run(`
`151`	`151`	`['commit', '--allow-empty', '-m', 'foo'],`
`152`		`- env={},`
	`152`	`+ # XXX: 'HOME' makes this test pass on OSX`
	`153`	`+ env={'HOME': os.environ['HOME']},`
`153`	`154`	`retcode=None,`
`154`	`155`	`)`
`155`	`156`	`assert ret == 1`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ def test_cwd_of_hook(tmpdir_factory, store):`
`180`	`180`	`with local.cwd(path):`
`181`	`181`	`_test_hook_repo(`
`182`	`182`	`tmpdir_factory, store, 'prints_cwd_repo',`
`183`		`- 'prints_cwd', [], path + '\n',`
	`183`	`+ 'prints_cwd', ['-L'], path + '\n',`
`184`	`184`	`)`
`185`	`185`
`186`	`186`
`@@ -284,7 +284,7 @@ def test_tags_on_repositories(in_tmpdir, tmpdir_factory, store):`
`284`	`284`	`repo_1 = Repository.create(`
`285`	`285`	`make_config_from_repo(git_dir_1, sha=tag), store,`
`286`	`286`	`)`
`287`		`- ret = repo_1.run_hook('prints_cwd', [])`
	`287`	`+ ret = repo_1.run_hook('prints_cwd', ['-L'])`
`288`	`288`	`assert ret[0] == 0`
`289`	`289`	`assert ret[1].strip() == in_tmpdir`
`290`	`290`