diff options
author | uranix <uranix@yandex-team.ru> | 2022-02-10 16:47:58 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:58 +0300 |
commit | 5dc58bb9405dd89d5727cc5984b067cd5cf98133 (patch) | |
tree | ab6c56039a12afe5127ceb7e5bdbd30f28bd4565 | |
parent | 01beb2a58f2156c63596a6dba7069307fc6f286e (diff) | |
download | ydb-5dc58bb9405dd89d5727cc5984b067cd5cf98133.tar.gz |
Restoring authorship annotation for <uranix@yandex-team.ru>. Commit 1 of 2.
-rw-r--r-- | contrib/libs/curl/lib/curl_config-linux.h | 6 | ||||
-rw-r--r-- | contrib/libs/curl/lib/curl_config-musl.h | 10 | ||||
-rw-r--r-- | contrib/libs/curl/lib/curl_config.h | 8 | ||||
-rw-r--r-- | library/python/testing/yatest_common/yatest/common/runtime_java.py | 2 | ||||
-rw-r--r-- | util/string/join_ut.cpp | 4 | ||||
-rw-r--r-- | ydb/tests/library/harness/kikimr_runner.py | 6 | ||||
-rw-r--r-- | ydb/tests/library/predicates/blobstorage.py | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/contrib/libs/curl/lib/curl_config-linux.h b/contrib/libs/curl/lib/curl_config-linux.h index 0dfa912535..249afdc8d9 100644 --- a/contrib/libs/curl/lib/curl_config-linux.h +++ b/contrib/libs/curl/lib/curl_config-linux.h @@ -306,7 +306,7 @@ #define HAVE_GETTIMEOFDAY 1 /* Define to 1 if you have a working glibc-style strerror_r function. */ -#define HAVE_GLIBC_STRERROR_R 1 +#define HAVE_GLIBC_STRERROR_R 1 /* Define to 1 if you have a working gmtime_r function. */ #define HAVE_GMTIME_R 1 @@ -472,7 +472,7 @@ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the memrchr function or macro. */ -#define HAVE_MEMRCHR 1 +#define HAVE_MEMRCHR 1 /* Define to 1 if you have the MSG_NOSIGNAL flag. */ #define HAVE_MSG_NOSIGNAL 1 @@ -554,7 +554,7 @@ #define HAVE_POLL_H 1 /* Define to 1 if you have a working POSIX-style strerror_r function. */ -/* #undef HAVE_POSIX_STRERROR_R */ +/* #undef HAVE_POSIX_STRERROR_R */ /* Define to 1 if you have the <proto/bsdsocket.h> header file. */ /* #undef HAVE_PROTO_BSDSOCKET_H */ diff --git a/contrib/libs/curl/lib/curl_config-musl.h b/contrib/libs/curl/lib/curl_config-musl.h index d0b3cedae5..3c31363061 100644 --- a/contrib/libs/curl/lib/curl_config-musl.h +++ b/contrib/libs/curl/lib/curl_config-musl.h @@ -1,5 +1,5 @@ -/* Define to 1 if you have a working glibc-style strerror_r function. */ -#undef HAVE_GLIBC_STRERROR_R - -/* Define to 1 if you have a working POSIX-style strerror_r function. */ -#define HAVE_POSIX_STRERROR_R 1 +/* Define to 1 if you have a working glibc-style strerror_r function. */ +#undef HAVE_GLIBC_STRERROR_R + +/* Define to 1 if you have a working POSIX-style strerror_r function. */ +#define HAVE_POSIX_STRERROR_R 1 diff --git a/contrib/libs/curl/lib/curl_config.h b/contrib/libs/curl/lib/curl_config.h index e58dec7079..b856fe0b67 100644 --- a/contrib/libs/curl/lib/curl_config.h +++ b/contrib/libs/curl/lib/curl_config.h @@ -18,10 +18,10 @@ # include "curl_config-linux.h" #endif -#if defined(_musl_) -# include "curl_config-musl.h" -#endif - +#if defined(_musl_) +# include "curl_config-musl.h" +#endif + // Do not misrepresent host on Android and iOS. #undef OS #define OS "arcadia" diff --git a/library/python/testing/yatest_common/yatest/common/runtime_java.py b/library/python/testing/yatest_common/yatest/common/runtime_java.py index 39bbb45570..3bcb996a6a 100644 --- a/library/python/testing/yatest_common/yatest/common/runtime_java.py +++ b/library/python/testing/yatest_common/yatest/common/runtime_java.py @@ -28,7 +28,7 @@ def get_java_path(jdk_dir): def get_build_java_dir(jdk_dir): - versions = [8, 10, 11, 12, 13, 14, 15] + versions = [8, 10, 11, 12, 13, 14, 15] if not _JAVA_DIR: for version in versions: diff --git a/util/string/join_ut.cpp b/util/string/join_ut.cpp index 3ed2b2459c..d85e8e26c0 100644 --- a/util/string/join_ut.cpp +++ b/util/string/join_ut.cpp @@ -32,8 +32,8 @@ Y_UNIT_TEST_SUITE(JoinStringTest) { UNIT_ASSERT_EQUAL(JoinSeq(" ", vv), "1 2 3"); UNIT_ASSERT_EQUAL(JoinSeq(" ", vv), JoinRange(" ", vv.begin(), vv.end())); UNIT_ASSERT_EQUAL(JoinRange(" ", v, v + 2), "1 2"); - UNIT_ASSERT_EQUAL(JoinSeq(" ", {}), ""); - UNIT_ASSERT_EQUAL(JoinSeq(" ", {42}), "42"); + UNIT_ASSERT_EQUAL(JoinSeq(" ", {}), ""); + UNIT_ASSERT_EQUAL(JoinSeq(" ", {42}), "42"); UNIT_ASSERT_EQUAL(JoinSeq(" ", {1, 2, 3}), "1 2 3"); UNIT_ASSERT_VALUES_EQUAL(JoinSeq(" ", v), "1 2 3"); } diff --git a/ydb/tests/library/harness/kikimr_runner.py b/ydb/tests/library/harness/kikimr_runner.py index 251f485b5d..ab1119c0c7 100644 --- a/ydb/tests/library/harness/kikimr_runner.py +++ b/ydb/tests/library/harness/kikimr_runner.py @@ -510,9 +510,9 @@ class KiKiMR(kikimr_cluster_interface.KiKiMRClusterInterface): return blobstorage_controller_has_started_on_some_node(monitors) timeout_seconds = yatest_common.plain_or_under_sanitizer(120, 240) - bs_controller_started = wait_for( - predicate=predicate, timeout_seconds=timeout_seconds, step_seconds=1.0, multiply=1.3 - ) + bs_controller_started = wait_for( + predicate=predicate, timeout_seconds=timeout_seconds, step_seconds=1.0, multiply=1.3 + ) assert bs_controller_started diff --git a/ydb/tests/library/predicates/blobstorage.py b/ydb/tests/library/predicates/blobstorage.py index eee12f285f..ee6fbe0329 100644 --- a/ydb/tests/library/predicates/blobstorage.py +++ b/ydb/tests/library/predicates/blobstorage.py @@ -15,7 +15,7 @@ def blobstorage_controller_has_started_on_some_node(monitors): counters='tablets', sensor='Tx(all)', type='BSController', category='executor' ) - predicates.append(tx_all_counter is not None) + predicates.append(tx_all_counter is not None) return any(predicates) |