Skip to content

Commit e0f4d52

Browse files
committed
refactor!: package integration testing framework
pyproject.toml file has been updated to correctly define the package structure tests and testutils directories are now exposed as top-level packages named integration_tests and integration_testutils respectively sub-packages are now explicitly listed in pyproject.toml docker-compose*.yml files have been moved from the project root into a new tests/data/compose/ dir docker-compose*.yml files are now treated as package data and included in the integration_tests.data.compose package import statements within the integration_tests and integration_testutils directories have been updated code that previously loaded docker-compose files using relative file paths (e.g., in tests/conftest.py) has been refactored to use the compose files trough importlib.resources Ticket: QA-1170 Changelog: Refactored the integration testing suite into an actual, installable Python package named mender-integration Signed-off-by: Dusan Haustein <dusan.haustein@northern.tech>
1 parent 7ff07c3 commit e0f4d52

120 files changed

Lines changed: 283 additions & 194 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
recursive-include integration_tests/data/compose *.yml

tests/MenderAPI/authentication.py renamed to integration_tests/MenderAPI/authentication.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
from . import get_container_manager
2222
from .requests_helpers import requests_retry
2323

24-
from testutils.infra.cli import CliUseradm, CliTenantadm
25-
from testutils.infra.container_manager.kubernetes_manager import isK8S
24+
from integration_testutils.infra.cli import CliUseradm, CliTenantadm
25+
from integration_testutils.infra.container_manager.kubernetes_manager import isK8S
2626

2727

2828
class Authentication:
File renamed without changes.

tests/MenderAPI/deviceconnect.py renamed to integration_tests/MenderAPI/deviceconnect.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from testutils.util import websockets
16-
from testutils.api import deviceconnect
15+
from integration_testutils.util import websockets
16+
from integration_testutils.api import deviceconnect
1717
from . import api_version
1818
from . import get_container_manager
1919

File renamed without changes.

0 commit comments

Comments
 (0)