Browse Source

tox: get tests passing a bit on Windows

We need to use the path separators provided by the python library,
and we need to set the git env vars so the name is always known.
Not all tests pass, but at least the basic frameworks work now.

Change-Id: Icea67098a8d7d58bbf918c78325681cf12a2e5f2
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/255313
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>
Mike Frysinger 6 năm trước cách đây
mục cha
commit
d21638424c
2 tập tin đã thay đổi với 10 bổ sung4 xóa
  1. 5 3
      run_tests
  2. 5 1
      tox.ini

+ 5 - 3
run_tests

@@ -42,9 +42,11 @@ def main(argv):
   """The main entry."""
   """The main entry."""
   # Add the repo tree to PYTHONPATH as the tests expect to be able to import
   # Add the repo tree to PYTHONPATH as the tests expect to be able to import
   # modules directly.
   # modules directly.
-  topdir = os.path.dirname(os.path.realpath(__file__))
-  pythonpath = os.environ.get('PYTHONPATH', '')
-  os.environ['PYTHONPATH'] = '%s:%s' % (topdir, pythonpath)
+  pythonpath = os.path.dirname(os.path.realpath(__file__))
+  oldpythonpath = os.environ.get('PYTHONPATH', None)
+  if oldpythonpath is not None:
+    pythonpath += os.pathsep + oldpythonpath
+  os.environ['PYTHONPATH'] = pythonpath
 
 
   return run_pytest('pytest', argv)
   return run_pytest('pytest', argv)
 
 

+ 5 - 1
tox.ini

@@ -19,7 +19,11 @@ envlist = py27, py36, py37, py38
 
 
 [testenv]
 [testenv]
 deps = pytest
 deps = pytest
-commands = {toxinidir}/run_tests
+commands = {envpython} run_tests
+setenv =
+    GIT_AUTHOR_NAME = Repo test author
+    GIT_COMMITTER_NAME = Repo test committer
+    EMAIL = repo@gerrit.nodomain
 
 
 [testenv:py27]
 [testenv:py27]
 deps =
 deps =