From 6a7e234b584eff3fbbd5686f5ec75cba3d25667c Mon Sep 17 00:00:00 2001
From: Josip Sokcevic <sokcevic@google.com>
Date: Fri, 27 Mar 2020 23:31:11 +0000
Subject: [PATCH] Fix Windows unit tests for roll-dep and use py3

R=ehmaldonado@chromium.org

Change-Id: I5bf1aa21a5ae9b90dbab4cc0439ca19e73de337f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2125221
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
---
 PRESUBMIT.py           |  1 -
 tests/roll_dep_test.py | 35 +++++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 tests/roll_dep_test.py

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 74742d0a58..26f86f09cb 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -82,7 +82,6 @@ def CommonChecks(input_api, output_api, tests_to_black_list, run_on_python3):
         r'.*git_map_test\.py$',
         r'.*ninjalog_uploader_test\.py$',
         r'.*recipes_test\.py$',
-        r'.*roll_dep_test\.py$',
     ]
 
   # TODO(maruel): Make sure at least one file is modified first.
diff --git a/tests/roll_dep_test.py b/tests/roll_dep_test.py
old mode 100644
new mode 100755
index 2da96daddf..de50331a33
--- a/tests/roll_dep_test.py
+++ b/tests/roll_dep_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 # Copyright (c) 2018 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -32,19 +32,20 @@ class FakeRepos(fake_repos.FakeReposBase):
         'origin': 'git/repo_2@3',
     })
 
-    self._commit_git('repo_1', {
-        'DEPS': '\n'.join([
-            'deps = {',
-            ' "src/foo": "%(git_base)srepo_2@%(repo_2_revision)s",',
-            '}',
-            'hooks = [',
-            '  {"action": ["foo", "--android", "{checkout_android}"]}',
-            ']',
-        ]) % {
-            'git_base': self.git_base,
-            'repo_2_revision': self.git_hashes['repo_2'][1][0],
-        },
-    })
+    self._commit_git(
+        'repo_1', {
+            'DEPS': '\n'.join([
+                'deps = {',
+                ' "src/foo": "file:///%(git_base)srepo_2@%(repo_2_revision)s",',
+                '}',
+                'hooks = [',
+                '  {"action": ["foo", "--android", "{checkout_android}"]}',
+                ']',
+            ]) % {
+                'git_base': self.git_base.replace('\\', '\\\\'),
+                'repo_2_revision': self.git_hashes['repo_2'][1][0],
+            },
+        })
 
 
 class RollDepTest(fake_repos.FakeReposTestBase):
@@ -97,7 +98,8 @@ class RollDepTest(fake_repos.FakeReposTestBase):
     self.assertEqual(self.gitrevparse(self.foo_dir), expected_revision)
     self.assertEqual([
         'deps = {',
-        ' "src/foo": "' + self.git_base + 'repo_2@' + expected_revision + '",',
+        ' "src/foo": "file:///' + self.git_base.replace('\\', '\\\\') +
+        'repo_2@' + expected_revision + '",',
         '}',
         'hooks = [',
         '  {"action": ["foo", "--android", "{checkout_android}"]}',
@@ -128,7 +130,8 @@ class RollDepTest(fake_repos.FakeReposTestBase):
     self.assertEqual(self.gitrevparse(self.foo_dir), expected_revision)
     self.assertEqual([
         'deps = {',
-        ' "src/foo": "' + self.git_base + 'repo_2@' + expected_revision + '",',
+        ' "src/foo": "file:///' + self.git_base.replace('\\', '\\\\') +
+        'repo_2@' + expected_revision + '",',
         '}',
         'hooks = [',
         '  {"action": ["foo", "--android", "{checkout_android}"]}',