install-build-deps: don't fail on new unchecked file in test/data
I found a flaw in the install-build-deps --check-only flow.
The issue is the following:
1. touch test/data/temp
2. tools/install-build-deps --check-only=/dev/null
1 will will fail and prompt the user to run tools/install-build-deps.
Unfortunately tools/install-build-deps won't fix the failure. This
is because install-build-deps only synchronizes existing files,
doesn't try to upload new files (which is WAI).
So we are in a state where tools/test_data --status says
"test/data is out of sync, because there is an unchecked file"
and that causes install-build-deps --check-only to fail.
The right thing to do is to introduce a --ignore-new flag to
tools/test_data, so status checks only existing files and not
new files.
Change-Id: Ic3a5d6cc923a36ec5662191734e00a1386a7c4bb
diff --git a/tools/install-build-deps b/tools/install-build-deps
index 2d9d595..bd9100c 100755
--- a/tools/install-build-deps
+++ b/tools/install-build-deps
@@ -618,8 +618,10 @@
InstallNodeModules(force_clean=nodejs_updated)
cur_python_interpreter = sys.executable
- test_data_synced = 0 == subprocess.call(
- [cur_python_interpreter, TEST_DATA_SCRIPT, 'status', '--quiet'])
+ test_data_synced = 0 == subprocess.call([
+ cur_python_interpreter, TEST_DATA_SCRIPT, 'status', '--quiet',
+ '--ignore-new'
+ ])
if args.check_only:
if not deps_updated and test_data_synced:
with open(args.check_only, 'w') as f:
@@ -629,6 +631,8 @@
[x for x in sys.argv[1:] if not x.startswith('--check-only')])
print('\033[91mBuild deps are stale. ' +
'Please run tools/install-build-deps %s\033[0m' % argz)
+ if not test_data_synced:
+ print('//test/data/ is out of sync. `tools/test_data status` for details')
return 1
if not test_data_synced:
