feat ci: reenable golden tests for chaotic

Tests: протестировано CI
commit_hash:4939ffebe5797fcee1a99a62dc30e90aa258e4df

Author: apolukhin

chaotic/CMakeLists.txt

@@ -27,9 +27,9 @@ if(USERVER_BUILD_TESTS)
     add_subdirectory(integration_tests)
 
     option(USERVER_CHAOTIC_GOLDEN_TESTS "Whether to run golden tests of chaotic" ON)
-    #if (USERVER_CHAOTIC_GOLDEN_TESTS)
-    #    add_subdirectory(golden_tests)
-    #endif()
+    if (USERVER_CHAOTIC_GOLDEN_TESTS)
+        add_subdirectory(golden_tests)
+    endif()
 endif()
 
 _userver_directory_install(

chaotic/chaotic/cpp_format.py

@@ -1,8 +1,10 @@
 import subprocess
 
+SIMPLE_STYLE = '{BasedOnStyle: Google, ColumnLimit: 120}'
+
 
 def format_pp(input_: str, *, binary: str) -> str:
     if not binary:
         return input_
-    output = subprocess.check_output([binary], input=input_, encoding='utf-8')
+    output = subprocess.check_output([binary, '--style', SIMPLE_STYLE], input=input_, encoding='utf-8')
     return output + '\n'

chaotic/golden_tests/CMakeLists.txt

@@ -22,7 +22,7 @@ userver_target_generate_chaotic(
 add_test(
     NAME chaotic-golden
     COMMAND "${USERVER_CHAOTIC_PYTEST_PYTHON_BINARY}"
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/diff-clang-format.py
+    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/diff-clang-format.py"
     --golden-dir "${CMAKE_CURRENT_SOURCE_DIR}/output"
     --generated-dir "${CMAKE_CURRENT_BINARY_DIR}/src"
 )

chaotic/golden_tests/scripts/diff-clang-format.py

@@ -5,10 +5,12 @@
 import sys
 import tempfile
 
+SIMPLE_STYLE = '{BasedOnStyle: Google, ColumnLimit: 120}'
+
 
 def is_binary_available(binary_name: str) -> bool:
     try:
-        subprocess.checked_call(['which', binary_name], stdout=subprocess.DEVNULL)
+        subprocess.check_call(['which', binary_name], stdout=subprocess.DEVNULL)
         return True
     except subprocess.CalledProcessError:
         return False
@@ -28,7 +30,7 @@ def parse_args():
 def walk_xpp(path: str) -> list[str]:
     result = []
 
-    extensions = {'.hpp', '.cpp', '.ipp'}
+    extensions = ('.hpp', '.cpp', '.ipp')
     for root, _, files in os.walk(path):
         for file in files:
             if file.lower().endswith(extensions):
@@ -54,7 +56,7 @@ def main():
         shutil.copytree(args.golden_dir, golden_copy)
         shutil.copytree(args.generated_dir, generated_copy)
 
-        subprocess.check_call(['clang-format', '-i'] + walk_xpp(tmpdir))
+        subprocess.check_call(['clang-format', '--style', SIMPLE_STYLE, '-i'] + walk_xpp(tmpdir))
 
         result = subprocess.run(['diff', '-uNrpB', golden_copy, generated_copy], capture_output=True, text=True)
 

cmake/ChaoticGen.cmake

@@ -53,11 +53,14 @@ _userver_prepare_chaotic()
 
 # Generates ${TARGET} cmake target for C++ types, parsers, serializers from JSONSchema file(s).
 #
-# Options: - OUTPUT_DIR - where to put generated .cpp/.hpp/.ipp files, usually ${CMAKE_CURRENT_BINARY_DIR}/smth -
-# RELATIVE_TO - --relative-to option to chaotic-gen - FORMAT - can be ON/OFF, enable to format generated files, defaults
-# to USERVER_CHAOTIC_FORMAT - SCHEMAS - JSONSchema source files - ARGS - extra args to chaotic-gen -
-# INSTALL_INCLUDES_COMPONENT - component to install generated includes
-# LINK_TARGETS - targets to link (used by x-usrv-cpp-type)
+# Options:
+# - OUTPUT_DIR - where to put generated .cpp/.hpp/.ipp files, usually ${CMAKE_CURRENT_BINARY_DIR}/smth
+# - RELATIVE_TO - --relative-to option to chaotic-gen
+# - FORMAT - can be ON/OFF, enable to format generated files, defaults to USERVER_CHAOTIC_FORMAT
+# - SCHEMAS - JSONSchema source files
+# - ARGS - extra args to chaotic-gen
+# - INSTALL_INCLUDES_COMPONENT - component to install generated includes
+# - LINK_TARGETS - targets to link (used by x-usrv-cpp-type)
 function(userver_target_generate_chaotic TARGET)
     set(OPTIONS GENERATE_SERIALIZERS PARSE_EXTRA_FORMATS)
     set(ONE_VALUE_ARGS OUTPUT_DIR RELATIVE_TO FORMAT INSTALL_INCLUDES_COMPONENT OUTPUT_PREFIX ERASE_PATH_PREFIX)
@@ -149,7 +152,7 @@ function(userver_target_generate_chaotic TARGET)
         OUTPUT ${SCHEMAS}
         COMMAND ${CMAKE_COMMAND} -E env "USERVER_PYTHON=${USERVER_CHAOTIC_PYTHON_BINARY}" "${CHAOTIC_BIN}"
                 ${CHAOTIC_EXTRA_ARGS} ${CHAOTIC_ARGS} ${PARSE_SCHEMAS}
-                --clang-format "" # "${CLANG_FORMAT}"
+                --clang-format "${CLANG_FORMAT}"
         DEPENDS ${PARSE_SCHEMAS}
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
         VERBATIM ${CODEGEN}