intermediate changes

ref:ae0d820bd4c277e0556bfc89ee47187d2ef0dd20

9 files changed, 20 insertions, 16 deletions

diff --git a/build/ya.conf.json b/build/ya.conf.json
index 31ce5b891d5..9b80f744d62 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -8444,7 +8444,7 @@
         },
         "lama": {
             "formula": {
-                "sandbox_id": 1240644569,
+                "sandbox_id": 1247043408,
                 "match": "lama"
             },
             "executable": {
diff --git a/contrib/tools/python3/src/Include/pydtrace.h b/contrib/tools/python3/src/Include/pydtrace.h
index 1be8e7ab1b0..6aac3d3c705 100644
--- a/contrib/tools/python3/src/Include/pydtrace.h
+++ b/contrib/tools/python3/src/Include/pydtrace.h
@@ -8,7 +8,7 @@ extern "C" {
 
 #ifdef WITH_DTRACE
 
-#include "pydtrace_probes.h" // Y_IGNORE
+#error #include "pydtrace_probes.h"
 
 /* pydtrace_probes.h, on systems with DTrace, is auto-generated to include
    `PyDTrace_{PROBE}` and `PyDTrace_{PROBE}_ENABLED()` macros for every probe
diff --git a/contrib/tools/python3/src/Modules/_blake2/impl/blake2b-test.c b/contrib/tools/python3/src/Modules/_blake2/impl/blake2b-test.c
index fe14c1f0433..fabafc675c4 100644
--- a/contrib/tools/python3/src/Modules/_blake2/impl/blake2b-test.c
+++ b/contrib/tools/python3/src/Modules/_blake2/impl/blake2b-test.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "blake2.h"
-#include "blake2-kat.h" // Y_IGNORE
+#error #include "blake2-kat.h"
 int main( int argc, char **argv )
 {
   uint8_t key[BLAKE2B_KEYBYTES];
diff --git a/contrib/tools/python3/src/Modules/_blake2/impl/blake2bp-test.c b/contrib/tools/python3/src/Modules/_blake2/impl/blake2bp-test.c
index 95fd5e43ac2..a4ed5dd8e43 100644
--- a/contrib/tools/python3/src/Modules/_blake2/impl/blake2bp-test.c
+++ b/contrib/tools/python3/src/Modules/_blake2/impl/blake2bp-test.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "blake2.h"
-#include "blake2-kat.h" // Y_IGNORE
+#error #include "blake2-kat.h"
 
 int main( int argc, char **argv )
 {
diff --git a/contrib/tools/python3/src/Modules/_blake2/impl/blake2s-test.c b/contrib/tools/python3/src/Modules/_blake2/impl/blake2s-test.c
index caab342e6f4..505eaecfe2a 100644
--- a/contrib/tools/python3/src/Modules/_blake2/impl/blake2s-test.c
+++ b/contrib/tools/python3/src/Modules/_blake2/impl/blake2s-test.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "blake2.h"
-#include "blake2-kat.h" // Y_IGNORE
+#error #include "blake2-kat.h"
 int main( int argc, char **argv )
 {
   uint8_t key[BLAKE2S_KEYBYTES];
diff --git a/contrib/tools/python3/src/Modules/_blake2/impl/blake2sp-test.c b/contrib/tools/python3/src/Modules/_blake2/impl/blake2sp-test.c
index 80a38ad320b..4c10c517344 100644
--- a/contrib/tools/python3/src/Modules/_blake2/impl/blake2sp-test.c
+++ b/contrib/tools/python3/src/Modules/_blake2/impl/blake2sp-test.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "blake2.h"
-#include "blake2-kat.h" // Y_IGNORE
+#error #include "blake2-kat.h"
 
 int main( int argc, char **argv )
 {
diff --git a/contrib/tools/python3/src/Modules/_sha3/kcp/KeccakSponge.c b/contrib/tools/python3/src/Modules/_sha3/kcp/KeccakSponge.c
index f3bfdf0b947..bedfaed0e4c 100644
--- a/contrib/tools/python3/src/Modules/_sha3/kcp/KeccakSponge.c
+++ b/contrib/tools/python3/src/Modules/_sha3/kcp/KeccakSponge.c
@@ -16,11 +16,11 @@ http://creativecommons.org/publicdomain/zero/1.0/
 #include "KeccakSponge.h"
 
 #ifdef KeccakReference
-    #include "displayIntermediateValues.h" // Y_IGNORE
+    #error #include "displayIntermediateValues.h"
 #endif
 
 #ifndef KeccakP200_excluded
-    #include "KeccakP-200-SnP.h" // Y_IGNORE
+    #error #include "KeccakP-200-SnP.h"
 
     #define prefix KeccakWidth200
     #define SnP KeccakP200
@@ -38,7 +38,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
 #endif
 
 #ifndef KeccakP400_excluded
-    #include "KeccakP-400-SnP.h" // Y_IGNORE
+    #error #include "KeccakP-400-SnP.h"
 
     #define prefix KeccakWidth400
     #define SnP KeccakP400
@@ -56,7 +56,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
 #endif
 
 #ifndef KeccakP800_excluded
-    #include "KeccakP-800-SnP.h" // Y_IGNORE
+    #error #include "KeccakP-800-SnP.h"
 
     #define prefix KeccakWidth800
     #define SnP KeccakP800
diff --git a/contrib/tools/python3/src/Modules/_sha3/kcp/KeccakSponge.h b/contrib/tools/python3/src/Modules/_sha3/kcp/KeccakSponge.h
index cead2af9a3f..2222be0aaf8 100644
--- a/contrib/tools/python3/src/Modules/_sha3/kcp/KeccakSponge.h
+++ b/contrib/tools/python3/src/Modules/_sha3/kcp/KeccakSponge.h
@@ -146,19 +146,19 @@ int Prefix_SpongeSqueeze(Prefix_SpongeInstance *spongeInstance, unsigned char *d
     int prefix##_SpongeSqueeze(prefix##_SpongeInstance *spongeInstance, unsigned char *data, size_t dataByteLen);
 
 #ifndef KeccakP200_excluded
-    #include "KeccakP-200-SnP.h" // Y_IGNORE
+    #error #include "KeccakP-200-SnP.h"
     KCP_DeclareSpongeStructure(KeccakWidth200, KeccakP200_stateSizeInBytes, KeccakP200_stateAlignment)
     KCP_DeclareSpongeFunctions(KeccakWidth200)
 #endif
 
 #ifndef KeccakP400_excluded
-    #include "KeccakP-400-SnP.h" // Y_IGNORE
+    #error #include "KeccakP-400-SnP.h"
     KCP_DeclareSpongeStructure(KeccakWidth400, KeccakP400_stateSizeInBytes, KeccakP400_stateAlignment)
     KCP_DeclareSpongeFunctions(KeccakWidth400)
 #endif
 
 #ifndef KeccakP800_excluded
-    #include "KeccakP-800-SnP.h" // Y_IGNORE
+    #error #include "KeccakP-800-SnP.h"
     KCP_DeclareSpongeStructure(KeccakWidth800, KeccakP800_stateSizeInBytes, KeccakP800_stateAlignment)
     KCP_DeclareSpongeFunctions(KeccakWidth800)
 #endif
diff --git a/library/python/svn_version/ut/lib/test_simple.py b/library/python/svn_version/ut/test_simple.py
index 2c27af6c682..0eb94ccbbc2 100644
--- a/library/python/svn_version/ut/lib/test_simple.py
+++ b/library/python/svn_version/ut/test_simple.py
@@ -4,11 +4,15 @@ import library.python.svn_version as sv
 def test_simple():
     assert sv.svn_version()
     assert isinstance(sv.svn_version(), str)
-    assert sv.svn_revision()
+
+    # svn_revision() will be equal to zero on non-trunk commits
+    assert sv.svn_revision() >= 0
     assert isinstance(sv.svn_revision(), int)
-    assert sv.svn_last_revision()
+
+    # svn_last_revision() will be equal to zero on non-trunk commits
+    assert sv.svn_last_revision() >= 0
     assert isinstance(sv.svn_last_revision(), int)
-    assert sv.svn_last_revision() > 0
+
     assert sv.commit_id()
     assert isinstance(sv.commit_id(), str)
     assert len(sv.commit_id()) > 0