Stop dirsyncing fixtures again

Summary:
dirsync was temporarily enabled for fixtures in D68628003 so that ShipIt could be switched to xplat without causing massive code churn on GitHub. Now that xplat is the source of truth for both ShipIt and fbcode_builder, disable dirsync again, removing the fbcode copy of fixtures. Among other things, this fixes a regression in developer experience, particularly with source control operations.

Enable and fix `build_fixtures` and `fixture_test` in xplat.

Reviewed By: yoney

Differential Revision: D68730277

fbshipit-source-id: dc77903caff7558cd95fb27bcbc1160284c8efcf

Author: vitaut

thrift/compiler/test/build_fixtures.py

@@ -26,18 +26,18 @@
 from pathlib import Path
 from typing import Optional
 
-from thrift.compiler.test import fixture_utils
+from xplat.thrift.compiler.test import fixture_utils
 
 """
-* Invoke from the `/fbsource/fbcode/` directory using `buck run`:
+* Invoke from the `fbsource` directory using `buck run`:
 
-    buck run thrift/compiler/test:build_fixtures
+    buck run xplat/thrift/compiler/test:build_fixtures
 
-will build all fixtures under `thrift/compiler/test/fixtures`. Or
+will build all fixtures under `xplat/thrift/compiler/test/fixtures`. Or
 
-    buck run thrift/compiler/test:build_fixtures -- --fixture-names [$FIXTURENAMES]
+    buck run xplat/thrift/compiler/test:build_fixtures -- --fixture-names [$FIXTURENAMES]
 
-will only build selected fixtures under `thrift/compiler/test/fixtures`.
+will only build selected fixtures under `xplat/thrift/compiler/test/fixtures`.
 
 $FIXTURENAMES is a space-separated list of fixture names to build specifically
 (default is to build all fixtures).
@@ -191,6 +191,7 @@ async def main() -> int:
 
     repo_root_dir_abspath = Path(args.repo_root_dir).resolve(strict=True)
     assert repo_root_dir_abspath.is_dir()
+    repo_root_dir_abspath = repo_root_dir_abspath / "xplat"
 
     # Directory that contains all fixture directories (one fixture per sub-dir).
     fixtures_root_dir_abspath = repo_root_dir_abspath / "thrift/compiler/test/fixtures"

thrift/compiler/test/fixture_test.py

@@ -27,7 +27,7 @@
 import unittest
 from pathlib import Path
 
-from thrift.compiler.test import fixture_utils
+from xplat.thrift.compiler.test import fixture_utils
 
 
 _THRIFT_BIN_PATH = fixture_utils.get_thrift_binary_path(thrift_bin_arg=None)
@@ -108,7 +108,7 @@ def setUp(self) -> None:
         self.maxDiff = None
 
     def runTest(self, fixture_name: str) -> None:
-        repo_root_dir_abspath = Path.cwd()
+        repo_root_dir_abspath = Path.cwd() / "xplat"
         fixture_dir_abspath = (
             repo_root_dir_abspath / _FIXTURES_ROOT_DIR_RELPATH / fixture_name
         )
@@ -132,6 +132,7 @@ def runTest(self, fixture_name: str) -> None:
             subprocess.check_call(
                 fixture_cmd.build_command_args,
                 close_fds=True,
+                cwd=repo_root_dir_abspath,
             )
 
         # Compare generated code to fixture code
@@ -150,7 +151,9 @@ def test_method(self):
     setattr(klazz, test_method.__name__, test_method)
 
 
-for fixture_name in fixture_utils.get_all_fixture_names(_FIXTURES_ROOT_DIR_RELPATH):
+for fixture_name in fixture_utils.get_all_fixture_names(
+    "xplat" / _FIXTURES_ROOT_DIR_RELPATH
+):
     _add_fixture(FixtureTest, fixture_name)
 
 if __name__ == "__main__":