[tor-commits] [stem/master] Installation integ test failed when outside stem directory

[atagar@xxxxxxxxxxxxxx]

commit 2c239e208b8bad36fd2b3b6c2325f1013cd56600
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Wed May 24 12:20:17 2017 -0700

    Installation integ test failed when outside stem directory
    
    Odd, not sure why my earlier test runs didn't pick this up. The git calls we
    make need to specify the git directory so it works when invoked elsewhere.
    
      https://trac.torproject.org/projects/tor/ticket/22365
---
 test/integ/installation.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/integ/installation.py b/test/integ/installation.py
index 16da817..80a405d 100644
--- a/test/integ/installation.py
+++ b/test/integ/installation.py
@@ -131,16 +131,21 @@ class TestInstallation(unittest.TestCase):
     meant to test that our MANIFEST.in is up to date.
     """
 
+    git_dir = os.path.join(test.STEM_BASE, '.git')
+
     if not stem.util.system.is_available('git'):
       self.skipTest('(git unavailable)')
       return
+    elif not os.path.exists(git_dir):
+      self.skipTest('(not a git checkout)')
+      return
 
     setup().join()
 
     if SDIST_FAILURE:
       raise SDIST_FAILURE
 
-    git_contents = [line.split()[-1] for line in stem.util.system.call('git ls-tree --full-tree -r HEAD')]
+    git_contents = [line.split()[-1] for line in stem.util.system.call('git --git-dir=%s ls-tree --full-tree -r HEAD' % git_dir)]
 
     # tarball has a prefix 'stem-[verion]' directory so stipping that out
 

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits