Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions test/test_TCP_client.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import os
import sys

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in os.sys.path:
sys.path.insert(0, package_dictionary)

from PyFlow.network_api.connect_tcp import TCP_Client_Base

Expand Down
5 changes: 0 additions & 5 deletions test/test_TCP_server.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import os
import sys

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in os.sys.path:
sys.path.insert(0, package_dictionary)

from PyFlow.network_api.connect_tcp import TCP_Server_Base

Expand Down
5 changes: 0 additions & 5 deletions test/test_command_handlers.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import os
import sys
import builtins
import io
import json
from types import SimpleNamespace

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in os.sys.path:
sys.path.insert(0, package_dictionary)

import PyFlow.command_control_extension_tcp as ctl

Expand Down
5 changes: 1 addition & 4 deletions test/test_crypto_rsa.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@

import pytest

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in sys.path:
sys.path.insert(0, package_dictionary)

from PyFlow.network_api import rsa_crypto # noqa: E402
from PyFlow.network_api import rsa_crypto

try:
rsa_crypto.load_library()
Expand Down
8 changes: 2 additions & 6 deletions test/test_crypto_tcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,15 @@
import io
import os
import socket
import sys
import threading

import pytest

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in sys.path:
sys.path.insert(0, package_dictionary)

from test_util import server_ready, wait_until

from PyFlow.network_api import rsa_crypto # noqa: E402
from PyFlow.network_api.connect_tcp import TCP_Client_Base, TCP_Server_Base # noqa: E402
from PyFlow.network_api import rsa_crypto
from PyFlow.network_api.connect_tcp import TCP_Client_Base, TCP_Server_Base

try:
rsa_crypto.load_library()
Expand Down
5 changes: 0 additions & 5 deletions test/test_extension_TCP_setup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import os
import sys

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in os.sys.path:
sys.path.insert(0, package_dictionary)

import PyFlow.command_control_extension_tcp as ctl

Expand Down
3 changes: 0 additions & 3 deletions test/test_flow_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

import pytest

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in sys.path:
sys.path.insert(0, package_dictionary)

import PyFlow.flow_setup as fs

Expand Down
8 changes: 3 additions & 5 deletions test/test_rsa_crypto_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@

import pytest

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in sys.path:
sys.path.insert(0, package_dictionary)
import PyFlow.network_api.rsa_crypto as rc

import PyFlow.network_api.rsa_crypto as rc # noqa: E402
PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

try:
rc.load_library()
Expand Down Expand Up @@ -55,7 +53,7 @@ def test_load_library_falls_back_to_build_dir(tmp_path, monkeypatch):
# find the actual built .so and simulate only it existing
import glob

real = glob.glob(os.path.join(package_dictionary, "build", "libcrypto_api.so"))
real = glob.glob(os.path.join(PROJECT_ROOT, "build", "libcrypto_api.so"))
if not real:
pytest.skip("no built library in repo build/")
monkeypatch.setattr(
Expand Down
6 changes: 1 addition & 5 deletions test/test_tcp_broadcast_alloc.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@
client-side manual port-allocation machinery."""

import os
import sys
import threading
import time
from unittest.mock import MagicMock

import pytest

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in sys.path:
sys.path.insert(0, package_dictionary)

from PyFlow.network_api.connect_tcp import TCP_Client_Base, TCP_Server_Base # noqa: E402
from PyFlow.network_api.connect_tcp import TCP_Client_Base, TCP_Server_Base

_PORT = 65410

Expand Down
6 changes: 1 addition & 5 deletions test/test_tcp_file_transfer.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
"""End-to-end file-transfer tests (plain channel, no crypto)."""

import os
import sys
import threading
import time

import pytest

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in sys.path:
sys.path.insert(0, package_dictionary)

from test_util import server_ready, wait_until

from PyFlow.network_api.connect_tcp import TCP_Client_Base, TCP_Server_Base # noqa: E402
from PyFlow.network_api.connect_tcp import TCP_Client_Base, TCP_Server_Base

_PORT_COUNTER = 65420

Expand Down
5 changes: 0 additions & 5 deletions test/test_udp.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import os
import sys
import socket
import threading

import pytest

package_dictionary = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if package_dictionary not in os.sys.path:
sys.path.insert(0, package_dictionary)

from PyFlow.network_api.connect_udp import UDP

Expand Down