|
|
Created:
6 years, 10 months ago by Reid Kleckner Modified:
6 years, 8 months ago CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, M-A Ruel, iannucci+depot_tools_chromium.org, ilevy-cc_chromium.org Visibility:
Public. |
DescriptionDon't put unicode strings into the environment
This fixes 'gclient recurse ...' on Windows.
R=dpranke@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=260405
Patch Set 1 #
Messages
Total messages: 9 (0 generated)
Without this change, I get 'TypeError: environment can only contain strings' when trying to launch a subprocess. The non-strings where some unicode strings coming from here. PTAL
lgtm
The CQ bit was checked by rnk@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rnk@chromium.org/167443002/1
The CQ bit was unchecked by commit-bot@chromium.org
Presubmit check for 167443002-1 failed and returned exit status 1. Running presubmit commit checks ... Checking out rietveld... Running save-description-on-failure.sh Running push-basic.sh Running upstream.sh Running submit-from-new-dir.sh Running abandon.sh Running submodule-merge-test.sh Running upload-local-tracking-branch.sh Running hooks.sh Running post-dcommit-hook-test.sh Running upload-stale.sh Running patch.sh Running basic.sh ** Presubmit ERRORS ** tests/gclient_smoketest.py (92.26s) failed ......svn: Commit failed (details follow): svn: Conflict at '/origin' EEE....EEE..............EE..EEEEEE... ====================================================================== ERROR: testMultiSolutions (__main__.GClientSmokeBoth) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 1176, in setUp self.enabled = self.FAKE_REPOS.set_up_svn() and self.FAKE_REPOS.set_up_git() File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 353, in set_up_svn self.populateSvn() File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 504, in populateSvn self._commit_svn(fs) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 395, in _commit_svn commit_svn(self.svn_checkout, self.USERS[0][0], self.USERS[0][1]) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 81, in commit_svn cwd=repo) File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 514, in check_output return check_call_out(args, stdout=PIPE, **kwargs)[0] File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in check_call_out returncode, args, kwargs.get('cwd'), out[0], out[1]) CalledProcessError: Command svn commit /tmp/trialOzXKCf/repos/svn_checkout -m foo --non-interactive --no-auth-cache --username user1@example.com --password foo returned non-zero exit status 1 in /tmp/trialOzXKCf/repos/svn_checkout Adding origin Adding trunk Adding trunk/origin Adding trunk/other Adding trunk/other/origin Adding trunk/src Adding trunk/src/DEPS Adding trunk/src/DEPS.alt Adding trunk/src/origin Adding trunk/src/third_party Adding trunk/src/third_party/origin Adding trunk/third_party Adding trunk/third_party/foo Adding trunk/third_party/foo/origin Adding trunk/third_party/origin Adding trunk/third_party/prout Adding trunk/third_party/prout/origin Transmitting file data .......... ====================================================================== ERROR: testMultiSolutionsJobs (__main__.GClientSmokeBoth) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 1235, in testMultiSolutionsJobs ('trunk/other@2', 'src/other'))) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testMultiSolutionsMultiRev (__main__.GClientSmokeBoth) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 1273, in testMultiSolutionsMultiRev ('trunk/third_party/foo@2', 'src/third_party/prout'))) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testRevertAndStatus (__main__.GClientSmokeFromCheckout) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 1391, in testRevertAndStatus ('trunk/third_party/foo@1', 'foo/bar')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testRunHooks (__main__.GClientSmokeFromCheckout) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 1409, in testRunHooks ('trunk/third_party/foo@1', 'foo/bar')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testSync (__main__.GClientSmokeFromCheckout) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 1368, in testSync ('trunk/third_party/foo@1', 'foo/bar')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testRevertAndStatus (__main__.GClientSmokeSVN) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 553, in testRevertAndStatus ('trunk/other@2', 'src/other')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testRevertAndStatusDepsOs (__main__.GClientSmokeSVN) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 623, in testRevertAndStatusDepsOs ('trunk/third_party/prout@2', 'src/third_party/prout')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testSync (__main__.GClientSmokeSVN) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 322, in testSync ('trunk/other@2', 'src/other')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testSyncCustomDeps (__main__.GClientSmokeSVN) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 489, in testSyncCustomDeps ('trunk/src/third_party@2', 'new_deps')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testSyncCustomDepsNoDeps (__main__.GClientSmokeSVN) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 518, in testSyncCustomDepsNoDeps ('trunk/other@2', 'src/other')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testSyncIgnoredSolutionName (__main__.GClientSmokeSVN) TODO(maruel): This will become an error soon. ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 378, in testSyncIgnoredSolutionName ('trunk/other@2', 'src/other')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testSyncJobs (__main__.GClientSmokeSVN) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 422, in testSyncJobs ('trunk/other@2', 'src/other')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ====================================================================== ERROR: testSyncNoSolutionName (__main__.GClientSmokeSVN) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/gclient_smoketest.py", line 395, in testSyncNoSolutionName ('trunk/third_party/foo@2', 'src/third_party/prout')) File "/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line 818, in mangle_svn_tree tree = self.FAKE_REPOS.svn_revs[int(rev)] IndexError: list index out of range ---------------------------------------------------------------------- Ran 43 tests in 88.496s FAILED (errors=14) Presubmit checks took 166.1s to calculate.
lgtm We can confirm this commit as successfully addressing the issue on Win8, 64bit. >BEFORE< ``` PS C:\depot_tools> .\gclient fetch Cannot rebase: You have unstaged changes. Please commit or stash them. Failed to update depot_tools. Traceback (most recent call last): File "C:\depot_tools\\gclient.py", line 1965, in <module> sys.exit(Main(sys.argv[1:])) File "C:\depot_tools\\gclient.py", line 1953, in Main return dispatcher.execute(OptionParser(), argv) File "C:\depot_tools\subcommand.py", line 245, in execute return command(parser, args[1:]) File "C:\depot_tools\\gclient.py", line 1493, in CMDfetch '--jobs=%d' % options.jobs, '--scm=git', 'git', 'fetch'] + args) File "C:\depot_tools\\gclient.py", line 1482, in CMDrecurse progress=not options.no_progress) File "C:\depot_tools\\gclient.py", line 1273, in RunOnDeps work_queue.flush(revision_overrides, command, args, options=self._options) File "C:\depot_tools\gclient_utils.py", line 861, in run self.item.run(*self.args, **self.kwargs) File "C:\depot_tools\\gclient.py", line 748, in run filter_fn=filter_fn, File "C:\depot_tools\gclient_utils.py", line 467, in CheckCallAndFilter **kwargs) File "C:\depot_tools\subprocess2.py", line 237, in __init__ super(Popen, self).__init__(args, **kwargs) File "C:\depot_tools\python276_bin\lib\subprocess.py", line 709, in __init__ errread, errwrite) File "C:\depot_tools\python276_bin\lib\subprocess.py", line 957, in _execute_child startupinfo) TypeError: environment can only contain strings ``` >AFTER< ``` PS C:\depot_tools> .\gclient fetch Cannot rebase: You have unstaged changes. Please commit or stash them. Failed to update depot_tools. From https://chromium.googlesource.com/chromium/cdm/reference_build/chrome_win bff2f5f..44374b4 master -> origin/master From https://chromium.googlesource.com/external/googletest be1b3b6..d132283 master -> origin/master From https://chromium.googlesource.com/external/googlemock d138e25..ecde734 master -> origin/master From https://chromium.googlesource.com/external/angle * [new branch] chrome_m32 -> origin/chrome_m32 > origin/es3proto8c es3proto -git fetch: 13% (11/81) src/third_party/bidichecker 9c31834..b3ecc64 master -> origin/master From https://chromium.googlesource.com/native_client/src/native_client f8654ed..ce209f8 master -> origin/master From https://chromium.googlesource.com/chromium/deps/hunspell 3740397..d9ea3fb master -> origin/master From https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries bc7edb3..4560bdd master -> origin/master From https://chromium.googlesource.com/external/jsoncpp/jsoncpp/include b74e45c..c67c6c4 master -> origin/master From https://chromium.googlesource.com/external/jsoncpp/jsoncpp/src/lib_json c42a1be..7e79e97 master -> origin/master From https://chromium.googlesource.com/external/cld2ce/src/lib_json 9d8940c..495b668 master -> origin/master From https://chromium.googlesource.com/external/leveldb 2d749ea..e9c65d2 master -> origin/master From https://chromium.googlesource.com/chromium/third_party/ffmpeg 79ff844..681ca6b master -> origin/master * [new branch] merge-m33 -> origin/merge-m33 From https://chromium.googlesource.com/chromium/deps/libjpeg_turbo ```
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rnk@chromium.org/167443002/1
Message was sent while issue was closed.
Change committed as 260405 |