aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2024-10-10 15:49:43 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2024-10-10 16:00:53 +0300
commitac5aa42143c88e9616c4b6986cf89dad3cdb99ec (patch)
tree8bcfadd1e185eda677ac98486fde6546b7f4e5f7
parentf59d36b54f2f6d059da05514d7ef5ecf1ea09b08 (diff)
downloadydb-ac5aa42143c88e9616c4b6986cf89dad3cdb99ec.tar.gz
Intermediate changes
commit_hash:ec2de59c841270f9f65ce794885833c6f4800a62
-rw-r--r--contrib/python/websocket-client/py2/patches/01-fix-tests.patch8
-rw-r--r--contrib/python/websocket-client/py2/websocket/tests/test_http.py4
-rw-r--r--contrib/python/websocket-client/py2/websocket/tests/test_websocket.py4
-rw-r--r--contrib/python/websocket-client/py3/patches/01-fix-tests.patch8
-rw-r--r--contrib/python/websocket-client/py3/websocket/tests/test_http.py4
-rw-r--r--contrib/python/websocket-client/py3/websocket/tests/test_websocket.py4
6 files changed, 16 insertions, 16 deletions
diff --git a/contrib/python/websocket-client/py2/patches/01-fix-tests.patch b/contrib/python/websocket-client/py2/patches/01-fix-tests.patch
index 83acc3d9c6..ba276c9cee 100644
--- a/contrib/python/websocket-client/py2/patches/01-fix-tests.patch
+++ b/contrib/python/websocket-client/py2/patches/01-fix-tests.patch
@@ -5,8 +5,8 @@
def __init__(self, fname):
SockMock.__init__(self)
- path = os.path.join(os.path.dirname(__file__), fname)
-+ import yatest.common
-+ path = yatest.common.source_path(os.path.join('contrib/python/websocket-client/py2/websocket/tests', fname))
++ import yatest.common as yc
++ path = os.path.join(os.path.dirname(yc.source_path(__file__)), fname)
with open(path, "rb") as f:
self.add_packet(f.read())
@@ -26,8 +26,8 @@
def __init__(self, fname):
SockMock.__init__(self)
- path = os.path.join(os.path.dirname(__file__), fname)
-+ import yatest.common
-+ path = yatest.common.source_path(os.path.join('contrib/python/websocket-client/py2/websocket/tests', fname))
++ import yatest.common as yc
++ path = os.path.join(os.path.dirname(yc.source_path(__file__)), fname)
with open(path, "rb") as f:
self.add_packet(f.read())
diff --git a/contrib/python/websocket-client/py2/websocket/tests/test_http.py b/contrib/python/websocket-client/py2/websocket/tests/test_http.py
index f08bd0c91c..8271e7717d 100644
--- a/contrib/python/websocket-client/py2/websocket/tests/test_http.py
+++ b/contrib/python/websocket-client/py2/websocket/tests/test_http.py
@@ -66,8 +66,8 @@ class HeaderSockMock(SockMock):
def __init__(self, fname):
SockMock.__init__(self)
- import yatest.common
- path = yatest.common.source_path(os.path.join('contrib/python/websocket-client/py2/websocket/tests', fname))
+ import yatest.common as yc
+ path = os.path.join(os.path.dirname(yc.source_path(__file__)), fname)
with open(path, "rb") as f:
self.add_packet(f.read())
diff --git a/contrib/python/websocket-client/py2/websocket/tests/test_websocket.py b/contrib/python/websocket-client/py2/websocket/tests/test_websocket.py
index b1b66b8a71..b4aff8f793 100644
--- a/contrib/python/websocket-client/py2/websocket/tests/test_websocket.py
+++ b/contrib/python/websocket-client/py2/websocket/tests/test_websocket.py
@@ -99,8 +99,8 @@ class HeaderSockMock(SockMock):
def __init__(self, fname):
SockMock.__init__(self)
- import yatest.common
- path = yatest.common.source_path(os.path.join('contrib/python/websocket-client/py2/websocket/tests', fname))
+ import yatest.common as yc
+ path = os.path.join(os.path.dirname(yc.source_path(__file__)), fname)
with open(path, "rb") as f:
self.add_packet(f.read())
diff --git a/contrib/python/websocket-client/py3/patches/01-fix-tests.patch b/contrib/python/websocket-client/py3/patches/01-fix-tests.patch
index db6ba4b667..28d7c74be3 100644
--- a/contrib/python/websocket-client/py3/patches/01-fix-tests.patch
+++ b/contrib/python/websocket-client/py3/patches/01-fix-tests.patch
@@ -5,8 +5,8 @@
def __init__(self, fname):
SockMock.__init__(self)
- path = os.path.join(os.path.dirname(__file__), fname)
-+ import yatest.common
-+ path = yatest.common.source_path(os.path.join('contrib/python/websocket-client/py3/websocket/tests', fname))
++ import yatest.common as yc
++ path = os.path.join(os.path.dirname(yc.source_path(__file__)), fname)
with open(path, "rb") as f:
self.add_packet(f.read())
@@ -17,8 +17,8 @@
def __init__(self, fname):
SockMock.__init__(self)
- path = os.path.join(os.path.dirname(__file__), fname)
-+ import yatest.common
-+ path = yatest.common.source_path(os.path.join('contrib/python/websocket-client/py3/websocket/tests', fname))
++ import yatest.common as yc
++ path = os.path.join(os.path.dirname(yc.source_path(__file__)), fname)
with open(path, "rb") as f:
self.add_packet(f.read())
diff --git a/contrib/python/websocket-client/py3/websocket/tests/test_http.py b/contrib/python/websocket-client/py3/websocket/tests/test_http.py
index b8b363acc4..72465c2205 100644
--- a/contrib/python/websocket-client/py3/websocket/tests/test_http.py
+++ b/contrib/python/websocket-client/py3/websocket/tests/test_http.py
@@ -81,8 +81,8 @@ class SockMock:
class HeaderSockMock(SockMock):
def __init__(self, fname):
SockMock.__init__(self)
- import yatest.common
- path = yatest.common.source_path(os.path.join('contrib/python/websocket-client/py3/websocket/tests', fname))
+ import yatest.common as yc
+ path = os.path.join(os.path.dirname(yc.source_path(__file__)), fname)
with open(path, "rb") as f:
self.add_packet(f.read())
diff --git a/contrib/python/websocket-client/py3/websocket/tests/test_websocket.py b/contrib/python/websocket-client/py3/websocket/tests/test_websocket.py
index b665548cda..892312a2db 100644
--- a/contrib/python/websocket-client/py3/websocket/tests/test_websocket.py
+++ b/contrib/python/websocket-client/py3/websocket/tests/test_websocket.py
@@ -83,8 +83,8 @@ class SockMock:
class HeaderSockMock(SockMock):
def __init__(self, fname):
SockMock.__init__(self)
- import yatest.common
- path = yatest.common.source_path(os.path.join('contrib/python/websocket-client/py3/websocket/tests', fname))
+ import yatest.common as yc
+ path = os.path.join(os.path.dirname(yc.source_path(__file__)), fname)
with open(path, "rb") as f:
self.add_packet(f.read())