Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(733)

Unified Diff: tests/isolate_smoke_test.py

Issue 24813003: Move file path functions into utils/file_path.py. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/tools/swarm_client@master
Patch Set: Fix isolate_test_cases_smoke_test.py Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/file_path_test.py ('k') | tests/isolate_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/isolate_smoke_test.py
diff --git a/tests/isolate_smoke_test.py b/tests/isolate_smoke_test.py
index 0ec586287b5ded9c2052db86044e1c725593f8c7..d2e66e87f751f916ac72bdfc5ca00b5a9cd44dc9 100755
--- a/tests/isolate_smoke_test.py
+++ b/tests/isolate_smoke_test.py
@@ -21,6 +21,7 @@ sys.path.insert(0, ROOT_DIR)
import isolate
import isolateserver
+from utils import file_path
VERBOSE = False
@@ -265,7 +266,7 @@ class IsolateModeBase(IsolateBase):
u'command': [],
u'files': self._gen_files(read_only, empty_file, True),
u'isolate_file': isolate.safe_relpath(
- isolate.trace_inputs.get_native_path_case(unicode(self.filename())),
+ file_path.get_native_path_case(unicode(self.filename())),
unicode(os.path.dirname(self.isolated))),
u'relative_cwd': unicode(RELATIVE_CWD[self.case()]),
u'variables': {
@@ -361,7 +362,7 @@ class IsolateModeBase(IsolateBase):
out = e.stderr
self._expect_no_tree()
self._expect_no_result()
- root = isolate.trace_inputs.get_native_path_case(unicode(ROOT_DIR))
+ root = file_path.get_native_path_case(unicode(ROOT_DIR))
expected = (
'\n'
'Error: Input directory %s must have a trailing slash\n' %
@@ -378,7 +379,7 @@ class IsolateModeBase(IsolateBase):
out = e.stderr
self._expect_no_tree()
self._expect_no_result()
- root = isolate.trace_inputs.get_native_path_case(unicode(ROOT_DIR))
+ root = file_path.get_native_path_case(unicode(ROOT_DIR))
expected = (
'\n'
'Error: Input file %s doesn\'t exist\n' %
@@ -791,7 +792,7 @@ class Isolate_trace_read_merge(IsolateModeBase):
# Warning: merge updates .isolate files. But they are currently in their
# canonical format so they shouldn't be changed.
def _check_merge(self, filename):
- filepath = isolate.trace_inputs.get_native_path_case(
+ filepath = file_path.get_native_path_case(
os.path.join(unicode(ROOT_DIR), 'tests', 'isolate', filename))
expected = 'Updating %s\n' % isolate.safe_relpath(filepath, self.tempdir)
with open(filepath, 'rb') as f:
« no previous file with comments | « tests/file_path_test.py ('k') | tests/isolate_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698