Commit 7745cd3d authored by Yannick's avatar Yannick
Browse files

integration tests fix using wdms_client

parent bba9a46a
Pipeline #71810 failed with stages
in 21 minutes and 33 seconds
......@@ -13,8 +13,8 @@
# limitations under the License.
import pytest
from variables import Variables
from ..request_builders.wdms_variables import variables_dict
from wdms_client.variables import Variables
from wdms_client.request_builders.wdms_variables import variables_dict
WDMS_Variables = Variables.from_dict(variables_dict)
......
......@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from ..request_builders.wdms.about import build_request_about
from ..request_builders.wdms.status import build_request_status
from ..request_builders.wdms.version import build_request_version
from wdms_client.request_builders.wdms.about import build_request_about
from wdms_client.request_builders.wdms.status import build_request_status
from wdms_client.request_builders.wdms.version import build_request_version
from .fixtures import with_wdms_env
import pytest
@pytest.mark.tag('basic', 'smoke')
@pytest.mark.tag('basic', 'smoke', 'about')
def test_about(with_wdms_env):
result = build_request_about().call(with_wdms_env)
result.assert_ok()
......
......@@ -23,15 +23,15 @@ import pytest
from tests.unit.generate_data import generate_df
from .fixtures import with_wdms_env
from ..request_builders.wdms.crud.log import build_request_create_log, build_request_delete_log
from ..request_builders.wdms.session import build_delete_session
from ..request_runner import RequestRunner, Request
from wdms_client.request_builders.wdms.crud.log import build_request_create_log, build_request_delete_log
from wdms_client.request_builders.wdms.session import build_delete_session
from wdms_client.request_runner import RequestRunner, Request
from ..request_builders.wdms.crud.osdu_welllog import (
from wdms_client.request_builders.wdms.crud.osdu_welllog import (
build_request_create_osdu_welllog,
build_request_delete_osdu_welllog)
from ..request_builders.wdms.crud.osdu_wellboretrajectory import (
from wdms_client.request_builders.wdms.crud.osdu_wellboretrajectory import (
build_request_create_osdu_wellboretrajectory,
build_request_delete_osdu_wellboretrajectory)
......
......@@ -14,7 +14,7 @@
import pytest
from .fixtures import with_wdms_env
from ..request_builders import build_request
from wdms_client.request_builders import build_request
kind_list = ['well', 'wellbore', 'logset', 'marker', 'trajectory', 'log']
new_parameters_env = {'authorityKind': 'slb',
......
......@@ -14,7 +14,7 @@
import pytest
from .fixtures import with_wdms_env
from ..request_builders import build_request, get_cleaned_ref_and_res
from wdms_client.request_builders import build_request, get_cleaned_ref_and_res
kind_list = ['osdu_wellbore', 'osdu_well', 'osdu_welllog', 'osdu_wellboretrajectory', 'osdu_wellboremarkerset']
......
......@@ -16,10 +16,10 @@ import math
import pytest
from .fixtures import with_wdms_env
from ..request_builders.wdms.crud.dips import *
from wdms_client.request_builders.wdms.crud.dips import *
from jsonschema import validate
from ..request_builders.wdms.crud.log import build_request_get_log
from wdms_client.request_builders.wdms.crud.log import build_request_get_log
new_parameters_env = {'authorityKind': 'slb',
'prefix_data_entity_name': 'wdms_e2e_osdu'}
......
......@@ -14,7 +14,7 @@
import pytest
from .fixtures import with_wdms_env
from ..request_builders.wdms.crud.log import *
from wdms_client.request_builders.wdms.crud.log import *
@pytest.fixture(scope='module')
......
......@@ -13,8 +13,8 @@
# limitations under the License.
import pytest
from ..request_builders.wdms.crud.log import *
from request_runner import RequestRunner, Request
from wdms_client.request_builders.wdms.crud.log import *
from wdms_client.request_runner import RequestRunner, Request
from .fixtures import with_wdms_env
@pytest.fixture(scope="module")
......
......@@ -14,8 +14,8 @@
import pytest
from .fixtures import with_wdms_env
from ..request_builders.wdms.error_cases import build_request_create_log_with_invalid_data_should_422
from ..request_builders.wdms.model_extensibility import *
from wdms_client.request_builders.wdms.error_cases import build_request_create_log_with_invalid_data_should_422
from wdms_client.request_builders.wdms.model_extensibility import *
def test_create_log_with_invalid_data_should_422(with_wdms_env):
......
......@@ -14,8 +14,8 @@
import pytest
from .fixtures import with_wdms_env
from ..request_builders.wdms.recursive_delete.setup import *
from ..request_builders.wdms.recursive_delete.delete_well import *
from wdms_client.request_builders.wdms.recursive_delete.setup import *
from wdms_client.request_builders.wdms.recursive_delete.delete_well import *
from time import sleep
from random import randint
......
......@@ -16,8 +16,8 @@
This file contains test sample showing how use RequestRunner
"""
import pytest
from ..request_runner import Request, RequestRunner
from ..variables import Variables
from wdms_client.request_runner import Request, RequestRunner
from wdms_client.variables import Variables
def sample_of_test():
......
......@@ -14,8 +14,8 @@
import pytest
from .fixtures import with_wdms_env
from ..request_builders.wdms.search_apis.setup import *
from ..request_builders.wdms.search_apis.search import *
from wdms_client.request_builders.wdms.search_apis.setup import *
from wdms_client.request_builders.wdms.search_apis.search import *
from time import sleep
new_parameters_env = {'authorityKind': 'slb',
......
......@@ -14,8 +14,8 @@
import pytest
from .fixtures import with_wdms_env
from ..request_builders.wdms.search_apis.setup import *
from ..request_builders.wdms.search_apis.search import *
from wdms_client.request_builders.wdms.search_apis.setup import *
from wdms_client.request_builders.wdms.search_apis.search import *
from time import sleep
@pytest.fixture(params=['query', 'fastquery'])
......
......@@ -14,10 +14,10 @@
import pytest
from .fixtures import with_wdms_env
from ..request_builders.wdms.crud.osdu_welllog import (
from wdms_client.request_builders.wdms.crud.osdu_welllog import (
build_request_create_osdu_welllog,
build_request_delete_osdu_welllog)
from ..request_builders.wdms.session import (
from wdms_client.request_builders.wdms.session import (
build_create_session,
build_delete_session,
build_get_session,
......
import pytest
from .fixtures import with_wdms_env
from ..request_builders.wdms.crud.trajectory import build_request_create_trajectory, build_request_delete_trajectory, build_request_add_trajectory_bulk_data, build_request_get_trajectory_bulk_data
from wdms_client.request_builders.wdms.crud.trajectory import build_request_create_trajectory, build_request_delete_trajectory, build_request_add_trajectory_bulk_data, build_request_get_trajectory_bulk_data
@pytest.fixture(scope='module')
......
......@@ -3,7 +3,7 @@ from .fixtures import with_wdms_env
from jsonschema import validate
from ..request_builders.wdms.crud.trajectory import build_request_create_trajectory_with_id, \
from wdms_client.request_builders.wdms.crud.trajectory import build_request_create_trajectory_with_id, \
build_request_get_trajectory, build_request_get_trajectory_bulk_data, build_request_add_trajectory_bulk_data, \
build_request_create_trajectory, build_request_delete_trajectory
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment