kallithea Changeset - 7db1bcf1d95b

Changeset - 7db1bcf1d95b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 9 years ago 2016-06-14 01:12:09
madski@unity3d.com

tests: drop setting EMAIL environment variable before git commit - it doesn't work on Windows and seems unnecessary

To minimize the risk, we still remove it from the environment used for running the commands.

1 file changed with 2 insertions and 1 deletions:

kallithea/tests/other/manual_test_vcs_operations.py

0 comments (0 inline, 0 general)

kallithea/tests/other/manual_test_vcs_operations.py

➞

Show inline comments

@@ @@ -58,24 +58,25 @@ class Command(object): @@
     def execute(self, cmd, *args):
         """
         Runs command on the system with given ``args``.
         """
         command = cmd + ' ' + ' '.join(args)
         if DEBUG:
             print '*** CMD %s ***' % command
         testenv = dict(os.environ)
         testenv['LANG'] = 'en_US.UTF-8'
         testenv['LANGUAGE'] = 'en_US:en'
         testenv.pop('EMAIL', None) # might not be necessary
         p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE, cwd=self.cwd, env=testenv)
         stdout, stderr = p.communicate()
         if DEBUG:
             print 'stdout:', repr(stdout)
             print 'stderr:', repr(stderr)
         return stdout, stderr
 def _get_tmp_dir():
     return tempfile.mkdtemp(prefix='rc_integration_test')
@@ @@ -116,25 +117,25 @@ def _add_files_and_push(vcs, DEST, **kwa @@
     if os.name == 'nt':
         author_str = 'User <me@example.com>'
     else:
         author_str = 'User ǝɯɐᴎ <me@example.com>'
     for i in xrange(kwargs.get('files_no', 3)):
         cmd = """echo "added_line%s" >> %s""" % (i, added_file)
         Command(cwd).execute(cmd)
         if vcs == 'hg':
             cmd = """hg commit -m "committed new %s" -u "%s" "%s" """ % (
                 i, author_str, added_file
+            )
         elif vcs == 'git':
-            cmd = """EMAIL="me@example.com" git commit -m "committed new %s" --author "%s" "%s" """ % (
             cmd = """git commit -m "committed new %s" --author "%s" "%s" """ % (
                 i, author_str, added_file
+            )
         Command(cwd).execute(cmd)
     # PUSH it back
     _REPO = None
     if vcs == 'hg':
         _REPO = HG_REPO
     elif vcs == 'git':
         _REPO = GIT_REPO
     kwargs['dest'] = ''

0 comments (0 inline, 0 general)