holado 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of holado might be problematic. Click here for more details.
- holado/common/context/session_context.py +6 -5
- {holado-0.9.0.dist-info → holado-0.9.1.dist-info}/METADATA +1 -1
- {holado-0.9.0.dist-info → holado-0.9.1.dist-info}/RECORD +39 -39
- holado_core/common/block/base.py +3 -3
- holado_core/common/tools/path_manager.py +1 -1
- holado_django/server/django_projects/rest_api/rest_api/urls.py +1 -1
- holado_docker/tests/behave/steps/tools/docker_controller/client_steps.py +2 -2
- holado_docker/tools/docker_controller/client/rest/docker_controller_client.py +38 -1
- holado_docker/tools/docker_controller/server/run_docker_controller_in_docker.sh +3 -3
- holado_examples/tests/behave/testing_solution/environment.py +3 -3
- holado_examples/tests/behave/testing_solution/src/context/session_context.py +2 -2
- holado_examples/tests/behave/testing_solution/steps/config_steps.py +1 -1
- holado_multitask/multithreading/loopthread.py +4 -4
- holado_python/common/tools/datetime.py +35 -17
- holado_python/standard_library/ssl/resources/certificates/tcpbin.crt +16 -16
- holado_python/standard_library/ssl/resources/certificates/tcpbin.key +26 -26
- holado_python/tests/behave/steps/standard_library/datetime_steps.py +2 -2
- holado_rabbitmq/tools/rabbitmq/rabbitmq_manager.py +3 -3
- holado_report/campaign/campaign_manager.py +8 -3
- holado_report/report/builders/detailed_scenario_failed_report_builder.py +11 -7
- holado_report/report/builders/failure_report_builder.py +4 -3
- holado_report/report/builders/short_scenario_failed_report_builder.py +6 -5
- holado_report/report/builders/summary_report_builder.py +1 -1
- holado_report/report/builders/summary_scenario_failed_report_builder.py +6 -5
- holado_report/report/builders/summary_scenario_report_builder.py +12 -11
- holado_report/report/execution_historic.py +4 -2
- holado_report/report/report_manager.py +63 -13
- holado_rest/api/rest/rest_client.py +5 -1
- holado_test/__init__.py +3 -0
- holado_test/common/context/feature_context.py +3 -3
- holado_test/common/context/scenario_context.py +3 -3
- holado_test/common/context/step_context.py +3 -3
- holado_test/test_server/client/rest/test_server_client.py +117 -0
- holado_test/test_server/server/run_test_server_in_docker.sh +7 -7
- holado_value/common/tools/unique_value_manager.py +2 -1
- test_holado/environment.py +1 -1
- test_holado/logging.conf +1 -0
- holado_docker/tools/docker_controller/docker_controller_manager.py +0 -46
- {holado-0.9.0.dist-info → holado-0.9.1.dist-info}/WHEEL +0 -0
- {holado-0.9.0.dist-info → holado-0.9.1.dist-info}/licenses/LICENSE +0 -0
|
@@ -12,13 +12,13 @@
|
|
|
12
12
|
#################################################
|
|
13
13
|
|
|
14
14
|
from builtins import super
|
|
15
|
-
from _datetime import datetime
|
|
16
15
|
import logging
|
|
17
16
|
import os.path
|
|
18
17
|
from holado.common.context.context import Context
|
|
19
18
|
from holado_core.common.tools.tools import Tools
|
|
20
19
|
import threading
|
|
21
20
|
from holado.common.handlers.enums import ObjectStates
|
|
21
|
+
from holado_python.common.tools.datetime import DateTime
|
|
22
22
|
|
|
23
23
|
|
|
24
24
|
logger = logging
|
|
@@ -151,7 +151,7 @@ class SessionContext(Context):
|
|
|
151
151
|
report_path = None
|
|
152
152
|
if self.with_session_path:
|
|
153
153
|
# Create new report path for this session
|
|
154
|
-
name = "session_{}".format(
|
|
154
|
+
name = "session_{}".format(DateTime.now().strftime("%Y-%m-%d_%H-%M-%S"))
|
|
155
155
|
report_path = self.path_manager.get_reports_path(name)
|
|
156
156
|
logger.info(f"Reports location: {report_path}")
|
|
157
157
|
print(f"Reports location: {report_path}")
|
|
@@ -331,13 +331,14 @@ class SessionContext(Context):
|
|
|
331
331
|
|
|
332
332
|
with self.__multitask_lock:
|
|
333
333
|
# Log error on failing scenario
|
|
334
|
-
status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
|
|
334
|
+
category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
|
|
335
335
|
if status_validation != "Passed":
|
|
336
336
|
msg_list = []
|
|
337
|
+
category_str = f" ({category_validation})" if category_validation else ""
|
|
337
338
|
if step_failed is not None:
|
|
338
|
-
msg_list.append(f"Scenario {status_validation}: [scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line})]")
|
|
339
|
+
msg_list.append(f"Scenario {status_validation}{category_str}: [scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line})]")
|
|
339
340
|
else:
|
|
340
|
-
msg_list.append(f"Scenario {status_validation}: [scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?)]")
|
|
341
|
+
msg_list.append(f"Scenario {status_validation}{category_str}: [scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?)]")
|
|
341
342
|
step_error_message = ReportManager.get_step_error_message(step_failed)
|
|
342
343
|
if step_error_message:
|
|
343
344
|
msg_list.append(step_error_message)
|
|
@@ -4,7 +4,7 @@ holado/common/__init__.py,sha256=ZjXM-FRQgnfzRNXqcvJOGewDHVRR-U5-ugStSs8U2Xs,152
|
|
|
4
4
|
holado/common/context/__init__.py,sha256=3jJBLm8myrYF9jbdV1EhIA6BtnlmjX33eeoDpTzwmLA,1604
|
|
5
5
|
holado/common/context/context.py,sha256=MV8A6JSpUcTcfia_QzjyDLybQC50rZ-NA0ffotnHXQY,11994
|
|
6
6
|
holado/common/context/service_manager.py,sha256=LaCn8ukE1aqJynmwoexAYj5hCkdb_F3hXRtUBGqorUE,14087
|
|
7
|
-
holado/common/context/session_context.py,sha256=
|
|
7
|
+
holado/common/context/session_context.py,sha256=ib9m1kVg_G7C35GE0TqvhFtVqoCXqx-ioECI34IEIbI,23287
|
|
8
8
|
holado/common/handlers/__init__.py,sha256=d0KDUpaAAw1eBXyX08gaRh4RECnJlXjYQ0TcU-Ndicc,1372
|
|
9
9
|
holado/common/handlers/enums.py,sha256=ieqKVoukEiNyfE3KrKmMOImdbFS1ocUMud8JHe2xNLs,1662
|
|
10
10
|
holado/common/handlers/object.py,sha256=rDaav8zHTYfKVEaLtEdeXMxYXATGVcs2a7um1f5MvCs,7205
|
|
@@ -40,7 +40,7 @@ holado_core/common/actors/element_actor.py,sha256=ZWFEODzEozItsXYasE8QgDxZshCi7v
|
|
|
40
40
|
holado_core/common/actors/find_actor.py,sha256=3Xb5BIEeyhzAdZ6P3x3HTtYZZAF7Pi52xOp6lv3P7u4,4283
|
|
41
41
|
holado_core/common/actors/tree_actor.py,sha256=6qVKYuIyjpi7ehL5Q34GiHJa0w_iyPYAEAn78yVxt6c,1572
|
|
42
42
|
holado_core/common/actors/verify_actions.py,sha256=hkywifHLqzjgXdIZIIMYRrq_UpaZuhRR8sALPYY4MW0,2658
|
|
43
|
-
holado_core/common/block/base.py,sha256=
|
|
43
|
+
holado_core/common/block/base.py,sha256=5CntBPNy1R8qWY9Axq6lBC0SJ4zFvgZKUEop9LOCewI,3853
|
|
44
44
|
holado_core/common/block/block_manager.py,sha256=RRBLc4efmV4MQkTJU8Kd3TPL10yNGZ3RsMyLZeEIEdY,7696
|
|
45
45
|
holado_core/common/block/block_method.py,sha256=eeZK4KUN3xIXlhIpGT_FhVkn64sSZ59z6ZVOBjmgXcs,2108
|
|
46
46
|
holado_core/common/block/block_steps.py,sha256=xHjj2loNoKmBNNdKIM7GC5VVn86rHNgxs173pwOLIX0,1742
|
|
@@ -126,7 +126,7 @@ holado_core/common/tables/comparators/table_with_header_comparator.py,sha256=j7B
|
|
|
126
126
|
holado_core/common/tables/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
127
127
|
holado_core/common/tables/converters/table_converter.py,sha256=PD7NJoxtejpr4aS1l3YKcXW1aEn1xBxdi4Ljs5G7R4g,10251
|
|
128
128
|
holado_core/common/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
129
|
-
holado_core/common/tools/path_manager.py,sha256=
|
|
129
|
+
holado_core/common/tools/path_manager.py,sha256=vwf07C51H03RoZ-w3xLZQgKbC9XuOZlKm5zslXGhK_I,10743
|
|
130
130
|
holado_core/common/tools/string_tools.py,sha256=bQuMlI_yS7OoSPFL7qyfyXkrnjC8xHVpIsfmEC6JxhI,5590
|
|
131
131
|
holado_core/common/tools/tools.py,sha256=zkDz7u8S_02bfyN6K-p7-Ey_SkDxzu9DJljnczY0OAo,9683
|
|
132
132
|
holado_core/common/tools/comparators/comparator.py,sha256=K4LcXIRORHX5vkmDibI6P6Bu1L-6Xezb63ZzzOMKrWY,6812
|
|
@@ -178,7 +178,7 @@ holado_django/server/django_projects/rest_api/manage.py,sha256=tElgH5cQY8xlY1-mV
|
|
|
178
178
|
holado_django/server/django_projects/rest_api/rest_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
179
179
|
holado_django/server/django_projects/rest_api/rest_api/asgi.py,sha256=aTxP-NQKwxMWy9eRFU05I0ZzetU-xjblCtJCrnx5ImM,404
|
|
180
180
|
holado_django/server/django_projects/rest_api/rest_api/settings.py,sha256=9Qqw6yM-6ZwZEuL2J_vVtVzl1weWGC0XWhbhJzyEDNo,3324
|
|
181
|
-
holado_django/server/django_projects/rest_api/rest_api/urls.py,sha256=
|
|
181
|
+
holado_django/server/django_projects/rest_api/rest_api/urls.py,sha256=t3x9wVHog1oBNX_AZ5mu5pz7HJYoLwavkRWobPnYoaY,1372
|
|
182
182
|
holado_django/server/django_projects/rest_api/rest_api/wsgi.py,sha256=vuHLvl2v-OGGWQUz0fd6ekLrjRrJsAdnmIBFqZazP7k,404
|
|
183
183
|
holado_django/server/django_projects/rest_api/rest_api/application/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
184
184
|
holado_django/server/django_projects/rest_api/rest_api/application/admin.py,sha256=VWlhkFyPcKZz6ThllvIz1NT1yhDC-eBsdDWtpsuuhO0,65
|
|
@@ -193,12 +193,11 @@ holado_docker/__init__.py,sha256=CtGYR7aEkaCdAHPDAsu_ErjpVtYE0yz9wbgbfRUwS8s,157
|
|
|
193
193
|
holado_docker/sdk/docker/docker_client.py,sha256=rh1VLtcefIAZY88FMz7eyh1mFrWn3vVxop6TlC9t2sU,14138
|
|
194
194
|
holado_docker/sdk/docker/docker_service.py,sha256=SvMSIZ7XTCbC7q5rur03lJhJVSHL3uIq1dBQz9oDpkw,3767
|
|
195
195
|
holado_docker/tests/behave/steps/__init__.py,sha256=lrP0btKLA3qQD2wp3zbOp0ug8RmgpaYWCrOAWehcPiI,1298
|
|
196
|
-
holado_docker/tests/behave/steps/tools/docker_controller/client_steps.py,sha256=
|
|
197
|
-
holado_docker/tools/docker_controller/
|
|
198
|
-
holado_docker/tools/docker_controller/client/rest/docker_controller_client.py,sha256=1NiBNGRXozOK-92cyGdvW00Q8KuJNjfjMxgsuL4tqjw,4560
|
|
196
|
+
holado_docker/tests/behave/steps/tools/docker_controller/client_steps.py,sha256=6E_tI5YkIppszJXB8_E0B2OmyS6YxzhF4uB89sd6dLs,4809
|
|
197
|
+
holado_docker/tools/docker_controller/client/rest/docker_controller_client.py,sha256=s4tDe4JktpxZL_piGmtc5NnoMwy4PmstgAvsjwPFMjU,6239
|
|
199
198
|
holado_docker/tools/docker_controller/server/Dockerfile,sha256=zuSkj3HYDhvpjOSXmxL4oDqhN7dRB1YTX5Fyur1cuDY,1774
|
|
200
199
|
holado_docker/tools/docker_controller/server/requirements.txt,sha256=0RvLV3t2DyBR2FsbAd1WVEcbsVc6FVUN2horQJU4POo,57
|
|
201
|
-
holado_docker/tools/docker_controller/server/run_docker_controller_in_docker.sh,sha256=
|
|
200
|
+
holado_docker/tools/docker_controller/server/run_docker_controller_in_docker.sh,sha256=HPNEv51CAgEm0KZ3b3fV4pHwv5v6VDQAwomTnnL4mxY,3421
|
|
202
201
|
holado_docker/tools/docker_controller/server/grpc/README,sha256=cNOly0Lfsfz_qyhTqLGmELOXzAgZbByNUowuYrUnJa0,132
|
|
203
202
|
holado_docker/tools/docker_controller/server/grpc/__init__.py,sha256=QBkE1ydbCvARUimeSY2PvBkZ-Jp0bCv6k_l89a_8zNw,1551
|
|
204
203
|
holado_docker/tools/docker_controller/server/grpc/proto/compile_proto.py,sha256=NjcStLaAO_zKcSprrcGscq3R_4anh55QeguXLq6SPjo,2191
|
|
@@ -242,7 +241,7 @@ holado_examples/scripts/script_custom_initialization.py,sha256=yOWo08UwUqpDS2vjz
|
|
|
242
241
|
holado_examples/scripts/script_minimal_initialization.py,sha256=4cc3osHekltsJ4ZxmwiqiPYnaGP8tWBaMiz7mHHBiI0,889
|
|
243
242
|
holado_examples/tests/behave/testing_solution/__main__.py,sha256=IS48dqsE3gbHNYGS-1sSIkzfTpefZD58BoNPvQVL57M,299
|
|
244
243
|
holado_examples/tests/behave/testing_solution/behave_environment.py,sha256=-DYfSJkBuB2jOpPmYFtNDW-mnBqXWT8vfi5OE-MON80,1044
|
|
245
|
-
holado_examples/tests/behave/testing_solution/environment.py,sha256=
|
|
244
|
+
holado_examples/tests/behave/testing_solution/environment.py,sha256=6ye4OJKUzFviXZ2_Wsw9tkPhGnq6uUHF1HH0wBPHW00,1027
|
|
246
245
|
holado_examples/tests/behave/testing_solution/initialize_holado.py,sha256=IPYH-GYNiHV5-7ZCCH6CFmPpmACsPrTV74TYz3MRjpA,3102
|
|
247
246
|
holado_examples/tests/behave/testing_solution/logging.conf,sha256=R0yhuVbgQxl7RLA_SLgXvXaYuEzEGD24w8_tiWeiiR0,2687
|
|
248
247
|
holado_examples/tests/behave/testing_solution/requirements.txt,sha256=GEOHLDGhGbwfMoMt9lfY9iCkSTmby36bko3vqi8KioU,33
|
|
@@ -252,8 +251,8 @@ holado_examples/tests/behave/testing_solution/features/Configuration/Actions/con
|
|
|
252
251
|
holado_examples/tests/behave/testing_solution/features/NonReg/example.feature,sha256=AO_q3ubyC4yXg2ZVEY4mJscVfZhuv2itrbt56a7Xe3o,787
|
|
253
252
|
holado_examples/tests/behave/testing_solution/src/common/tools/path_manager.py,sha256=2-3bJIMXLnSD__0FX_rXWv2YGTrAPdAXoTPxz3qjaNY,1209
|
|
254
253
|
holado_examples/tests/behave/testing_solution/src/config/config_manager.py,sha256=WPSrkLX-C5oJ0bANSwzgBKeeSo38CBrgKGdMOp3pHtI,623
|
|
255
|
-
holado_examples/tests/behave/testing_solution/src/context/session_context.py,sha256=
|
|
256
|
-
holado_examples/tests/behave/testing_solution/steps/config_steps.py,sha256=
|
|
254
|
+
holado_examples/tests/behave/testing_solution/src/context/session_context.py,sha256=mwZ8H7qgBYWzIAJCuQnbYBh_2oqMqjxgN2dHl3TMzSA,1415
|
|
255
|
+
holado_examples/tests/behave/testing_solution/steps/config_steps.py,sha256=sToZrs7kFQMs7NPK_n3fsO2jXHHPH4d0rBSZnBe85S4,535
|
|
257
256
|
holado_examples/tests/behave/testing_solution/steps/public_steps.py,sha256=nnxgBjFMpuQ9xVAAxma0lRwLz8VrbTZuF61vRkKKafA,252
|
|
258
257
|
holado_grpc/TODO,sha256=ESjES2-J6-3AJYdt6olcz_YGt4YTxw80CjIt-tjJ0z4,206
|
|
259
258
|
holado_grpc/__init__.py,sha256=SaAz66iSTqMw7oIDrj94rGcO8W7BgS15B78p--OogHc,2266
|
|
@@ -314,7 +313,7 @@ holado_multitask/multitasking/multitask_manager.py,sha256=lPi4gqK9HNK3FR4Mi-0hDn
|
|
|
314
313
|
holado_multitask/multithreading/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
315
314
|
holado_multitask/multithreading/functionthreaded.py,sha256=jtfytI-AtST7Ay8U9ZvsCbWmYSvtZe8u-BvpmqWCO8Y,5848
|
|
316
315
|
holado_multitask/multithreading/loopfunctionthreaded.py,sha256=5kfONDR76uuT1bTJrAtnfSncHwvVvzl8jagWUvTduHw,2492
|
|
317
|
-
holado_multitask/multithreading/loopthread.py,sha256=
|
|
316
|
+
holado_multitask/multithreading/loopthread.py,sha256=fu0qnBtsIDxcKXzETGaCd0ubJg8uNRuHgYEyLFdV38g,4279
|
|
318
317
|
holado_multitask/multithreading/periodicfunctionthreaded.py,sha256=PCBKpbOIThNGLq12rOONAh2ECxEOmaOb6Aqj2Ob2XY8,6926
|
|
319
318
|
holado_multitask/multithreading/thread.py,sha256=dKgw1301nTv-8g7y29ecza9ZB5nhbAKCYs1p4KdmLUQ,9376
|
|
320
319
|
holado_multitask/multithreading/threadsmanager.py,sha256=5a-kV8t0-lwL6a9vCLL3_Oi-i67epcqOWWBz6vIJFEU,8462
|
|
@@ -341,7 +340,7 @@ holado_protobuf/tests/behave/steps/ipc/protobuf_steps.py,sha256=Pbw5E-AbTTSKR_i_
|
|
|
341
340
|
holado_python/__init__.py,sha256=uZzFUgE2zqLWiM-2yF9D5KinWqZYqoXYMCiD02A3iW8,1657
|
|
342
341
|
holado_python/common/enums.py,sha256=iwffWOqUdiFaOn83RPmjRVVHakTjQve55sNsbY4x8Ek,1535
|
|
343
342
|
holado_python/common/iterables.py,sha256=p5X6h18W-GSnZ4WHt5Y5g3Ri4TB4B5i5NhyAwb7g1Ww,2064
|
|
344
|
-
holado_python/common/tools/datetime.py,sha256=
|
|
343
|
+
holado_python/common/tools/datetime.py,sha256=f7bAhh5bQJ2eWXoSKso8IsrXHW_lEg4lRwg36n5Emdc,13397
|
|
345
344
|
holado_python/common/tools/comparators/boolean_comparator.py,sha256=66AtqQ1u7NLTKAmgZHdnbE8vMPfgwJ2ZrzMiea90jX0,2042
|
|
346
345
|
holado_python/common/tools/comparators/bytes_comparator.py,sha256=VKD5Q734n1k5Q0zX14fYgvM-66ysyRWkjo2fLgleyt0,2412
|
|
347
346
|
holado_python/common/tools/comparators/datetime_comparator.py,sha256=6smSvQ7ErnNuBNHkSbkf4HoSUJU54DNS2ILhxM1FHAk,3487
|
|
@@ -364,14 +363,14 @@ holado_python/standard_library/ssl/resources/certificates/NOTES.txt,sha256=GlPGG
|
|
|
364
363
|
holado_python/standard_library/ssl/resources/certificates/localhost.crt,sha256=iLmZpDuOQVawUlbZkb72g2-uv1c4SAmRJOrm4Th5anY,1123
|
|
365
364
|
holado_python/standard_library/ssl/resources/certificates/localhost.key,sha256=lP2NCvB9mr2E5sk8whA8FyQRcyU6H7sdWkJeKz80Hyc,1704
|
|
366
365
|
holado_python/standard_library/ssl/resources/certificates/rootCACert.pem,sha256=ECQDZ8OHRfqpZHCu6JRLMUjiONaPIhKZQF0-kidVrWQ,1424
|
|
367
|
-
holado_python/standard_library/ssl/resources/certificates/tcpbin.crt,sha256=
|
|
368
|
-
holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=
|
|
366
|
+
holado_python/standard_library/ssl/resources/certificates/tcpbin.crt,sha256=fNTwFb1YbCrDS6217atgX9wMP7xEAo3-POIVaWC_00A,1237
|
|
367
|
+
holado_python/standard_library/ssl/resources/certificates/tcpbin.key,sha256=puwUXC55YMr8AmXA77WiqYElt-JDYfhDKP8l6iELjd4,1704
|
|
369
368
|
holado_python/tests/behave/steps/__init__.py,sha256=TWEk-kBTTDHi9I4nuu48nufmNMdZ9FHAhPZv0A_cWzc,1661
|
|
370
369
|
holado_python/tests/behave/steps/convert_steps.py,sha256=bZqRvJVp_u6fSPpdu4ne9NwVyZmui7R-AVdO2-H-I1A,2728
|
|
371
370
|
holado_python/tests/behave/steps/iterable_steps.py,sha256=f4vGIWBH8Qnjq69Q-ZBluYyctQ8SKauazTc41dsktZA,4041
|
|
372
371
|
holado_python/tests/behave/steps/builtins/str_steps.py,sha256=ugNIz5v5EpkiRBDmwDl2JtAq5RWXu6UnLv7HH73WiXw,2101
|
|
373
372
|
holado_python/tests/behave/steps/standard_library/csv_steps.py,sha256=VJ5wmr0CQ8voBSgnXQUBAdYkEGFOCs95JKcV52tVMOo,7460
|
|
374
|
-
holado_python/tests/behave/steps/standard_library/datetime_steps.py,sha256=
|
|
373
|
+
holado_python/tests/behave/steps/standard_library/datetime_steps.py,sha256=6U1hZ5befOYvMub49b9WfkahecpPoICtsnUQnB0rBjg,7815
|
|
375
374
|
holado_python/tests/behave/steps/standard_library/hashlib_steps.py,sha256=j1NmcvFAFKYAhWeYWc6Xf32M0CPGTgk2fHcaBBbav8o,2978
|
|
376
375
|
holado_python/tests/behave/steps/standard_library/multiprocessing_steps.py,sha256=DD--5bxCvFTXY6KBqKzKAuOrOK0aZdPjbRR5SO0PZBo,2519
|
|
377
376
|
holado_python/tests/behave/steps/standard_library/queue_steps.py,sha256=GdHKKIka5tzFxVTBYPJNywyVLDtggZF2RB_mFIbyLdI,17429
|
|
@@ -383,7 +382,7 @@ holado_rabbitmq/tests/behave/steps/tools/rabbitmq_client_steps.py,sha256=z5BKvzo
|
|
|
383
382
|
holado_rabbitmq/tests/behave/steps/tools/rabbitmq_server_steps.py,sha256=hG6sXnZhiJ2RzxFUmlyx2ymTQNTqL_99B0dp5od7PT8,3081
|
|
384
383
|
holado_rabbitmq/tools/rabbitmq/rabbitmq_blocking_client.py,sha256=XjcllR9MKhTuj1Nibcd6DM-sCjwr7qWmBNVvREjd7KE,16486
|
|
385
384
|
holado_rabbitmq/tools/rabbitmq/rabbitmq_client.py,sha256=YQTNfi2Gs61LDA3wkdE4iCiHNuyH05m-OJuDFbI9834,29888
|
|
386
|
-
holado_rabbitmq/tools/rabbitmq/rabbitmq_manager.py,sha256=
|
|
385
|
+
holado_rabbitmq/tools/rabbitmq/rabbitmq_manager.py,sha256=0kwz0yq9ma6kvRv6hd4TjzF2GRVy8OSRfh1_p41OKAM,7761
|
|
387
386
|
holado_rabbitmq/tools/rabbitmq/rabbitmq_select_client.py,sha256=urWn9A8XZqpAAtbvRZ-YUGVbOX_1Y0uSBA2lHGqJxLA,21039
|
|
388
387
|
holado_rabbitmq/tools/rabbitmq/rabbitmq_server.py,sha256=FW8iKAHm0I78bHQEbRk4rl0dtCmv4dvAe5BY_HfOQVM,1613
|
|
389
388
|
holado_redis/__init__.py,sha256=Gl285tg-QaPE-3etWwZql9sH26G7EnVoQn97B0NMvOI,1248
|
|
@@ -393,25 +392,25 @@ holado_redis/tools/redis/TODO.txt,sha256=cmFyx6qS6_FgL1Ph0OWRsWch6MQaklfv1j0qBO2
|
|
|
393
392
|
holado_redis/tools/redis/redis_client.py,sha256=KWuOrnwTcwt5xkD3rtI_l07v164Y_bsoo1kE0IGzqaQ,8316
|
|
394
393
|
holado_redis/tools/redis/redis_manager.py,sha256=tMO0XrCZTCfGdByFfgWXk9R-I_TUPLO9wXMQf8yCYcQ,1814
|
|
395
394
|
holado_report/__init__.py,sha256=vjp7Ce8hO334H5V1Qk4uhDkvVspXD3iiS5oTrQSM_vs,1687
|
|
396
|
-
holado_report/campaign/campaign_manager.py,sha256=
|
|
397
|
-
holado_report/report/execution_historic.py,sha256=
|
|
398
|
-
holado_report/report/report_manager.py,sha256=
|
|
395
|
+
holado_report/campaign/campaign_manager.py,sha256=Py5aAGc-6rJb1FlDsUJ7EwyrGy0DBEXLPTJzR7yBMe8,8693
|
|
396
|
+
holado_report/report/execution_historic.py,sha256=M4lYoZwyrSivRa17Q39GOAgROnr0oBvIZX5BNcO5Mnc,6951
|
|
397
|
+
holado_report/report/report_manager.py,sha256=VOA9ABV3DAGf5Q5_eNPVJ3oJndiZSXGI8SKg6uP-Sq0,14713
|
|
399
398
|
holado_report/report/analyze/execution_historic_manager.py,sha256=FMKKPguXOvWNxjF7Q8DodHHsH-2ci9pFzrTV41B8nL4,4556
|
|
400
399
|
holado_report/report/analyze/scenario_duration_manager.py,sha256=Preaxu83qFKGfbvQnzolhSXztZ4i5Zo_Bnxx8tNA80Q,12468
|
|
401
|
-
holado_report/report/builders/detailed_scenario_failed_report_builder.py,sha256=
|
|
402
|
-
holado_report/report/builders/failure_report_builder.py,sha256=
|
|
400
|
+
holado_report/report/builders/detailed_scenario_failed_report_builder.py,sha256=hOXxHYniL9mpN-U7YTW5xVEaE4Z-GlPq8ltT_iNJan4,7892
|
|
401
|
+
holado_report/report/builders/failure_report_builder.py,sha256=jbw2Y1oEZQdk1i1PdbhQqbG8i3AuIlOmVRx3M598BTA,6532
|
|
403
402
|
holado_report/report/builders/json_execution_historic_report_builder.py,sha256=M7OGUvkqNRTG5Td7fO96tv1SJEzRzjm0pl1W02v052E,5929
|
|
404
403
|
holado_report/report/builders/report_builder.py,sha256=5qlhxbdTkSN7p9q6EADkpHQGPDVEHquIhgA3mK2Ck2k,2261
|
|
405
|
-
holado_report/report/builders/short_scenario_failed_report_builder.py,sha256=
|
|
406
|
-
holado_report/report/builders/summary_report_builder.py,sha256
|
|
407
|
-
holado_report/report/builders/summary_scenario_failed_report_builder.py,sha256=
|
|
408
|
-
holado_report/report/builders/summary_scenario_report_builder.py,sha256=
|
|
404
|
+
holado_report/report/builders/short_scenario_failed_report_builder.py,sha256=9athhQPoVioz-NTc1BoD0kbCqKzW3ARkQy77ODPuGkM,4011
|
|
405
|
+
holado_report/report/builders/summary_report_builder.py,sha256=v4LG3W5x_y4FH0kh_5MRaG8pyPOV2GfhlBImsW4BJrs,3954
|
|
406
|
+
holado_report/report/builders/summary_scenario_failed_report_builder.py,sha256=NGJiUTGpEWBcC9Chj6oY34fnQ_SUBoLWKEkBhlwKy9o,3062
|
|
407
|
+
holado_report/report/builders/summary_scenario_report_builder.py,sha256=OaHfZitXFoX0lrGXzRX6zeXGiUFiYh44fNdxxKDRCGQ,3864
|
|
409
408
|
holado_report/report/reports/base_report.py,sha256=NGnWe66uyvT4bCjhd3upwVpc6yQ2gyVNFhcy-3LeQsE,6850
|
|
410
409
|
holado_report/report/reports/feature_report.py,sha256=i0wpk3LQLArVjWDsP9UcNSJzAUWwLhe73HNyfye2gYQ,4810
|
|
411
410
|
holado_report/report/reports/scenario_report.py,sha256=eMyqw9EzaKMmX3pGFJN1rqAOQ5eqO2ISZdxAfK3XQR4,2945
|
|
412
411
|
holado_rest/__init__.py,sha256=BOeE6t6ejeqRYd44SE4vYJVTNz01BwcVCIWfwRQ5axg,1526
|
|
413
412
|
holado_rest/api/rest/TODO.txt,sha256=Oz8BYPkBEs9OAEgyYLLm7i5tJ1bRE5POBpT3SRFWTi4,29
|
|
414
|
-
holado_rest/api/rest/rest_client.py,sha256=
|
|
413
|
+
holado_rest/api/rest/rest_client.py,sha256=VHVzKKY_7QRiTUScAUIzFM-W4lbHFKnNBA09gxCnQ-E,9609
|
|
415
414
|
holado_rest/api/rest/rest_manager.py,sha256=XldPjNgj73GlzAmlsEcQYaHiDRk7SGU6VEFOLBnHjQM,4010
|
|
416
415
|
holado_rest/tests/behave/steps/__init__.py,sha256=lEH5NYkKtpgDV2ZAO1qAGNN4ipwILWMpgvQgnamgYKk,1283
|
|
417
416
|
holado_rest/tests/behave/steps/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -487,7 +486,7 @@ holado_system/tests/behave/steps/__init__.py,sha256=7LrCSTHk5oHNuEsr4IhJuNDsohtR
|
|
|
487
486
|
holado_system/tests/behave/steps/system/commands_steps.py,sha256=uYiojPpYPkfif8l8afRrJ0sj-wFBE4j1x67BDMNs76Q,3901
|
|
488
487
|
holado_system/tests/behave/steps/system/file_steps.py,sha256=-RPUGEjsYfzWIMRDiQRalmvspPZIPP8YMzSZvSI4-p8,9966
|
|
489
488
|
holado_system/tests/behave/steps/system/system_steps.py,sha256=2XrZwuAaYDjB_HvPgxZq9MpYB_Zo7FVZ0DYcmtKht2s,3778
|
|
490
|
-
holado_test/__init__.py,sha256=
|
|
489
|
+
holado_test/__init__.py,sha256=vJtCQyCdqEdCukAiuD8D6L59rfpGmW2-hJmypGi1d00,1744
|
|
491
490
|
holado_test/test_config.py,sha256=yQK2jNHEGltGc3fmsAgcsKN4y3_nuldZHD45XEMrsQA,1575
|
|
492
491
|
holado_test/behave/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
493
492
|
holado_test/behave/behave.py,sha256=IiqT_F45C-xVY2T8sKDPV7NsFCiGNzb8xpoTaXD-PXg,17708
|
|
@@ -497,15 +496,16 @@ holado_test/behave/behave_manager.py,sha256=TEAfPgBQQONFn_l0s7gm7gDgWU0EejvuaPuF
|
|
|
497
496
|
holado_test/behave/independant_runner.py,sha256=QR_IS-qkK_x2FTryb2gRQrqyBU3YUgKqsaIL2xwXPNQ,3189
|
|
498
497
|
holado_test/behave/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
499
498
|
holado_test/behave/scenario/behave_step_tools.py,sha256=apMS8nvdY-vbXsUIw1mVR4wOy2xWHMOCPJ1QiYNU-hI,6612
|
|
500
|
-
holado_test/common/context/feature_context.py,sha256=
|
|
501
|
-
holado_test/common/context/scenario_context.py,sha256=
|
|
502
|
-
holado_test/common/context/step_context.py,sha256=
|
|
499
|
+
holado_test/common/context/feature_context.py,sha256=9U5n-i7xdcSQlCeMM0savlek8doS5fGqkI3sFIiCGTY,3375
|
|
500
|
+
holado_test/common/context/scenario_context.py,sha256=pkv5uC-GGQeGyu2MB6m58eWv6TPuQLTV0NM_aGMB7c8,7129
|
|
501
|
+
holado_test/common/context/step_context.py,sha256=jknJVU0OrzRaqlTJyhwBFjr9uKPe1dgjao32F4RGE8g,2410
|
|
503
502
|
holado_test/common/exceptions/undefined_step_exception.py,sha256=SHHX22iz4Ip-V4Y3aM2EJFDt30CCS5EaauN6KB-JORo,1461
|
|
504
503
|
holado_test/scenario/step_tools.py,sha256=iNay6tQPUi4sG-a8PY5LbbLpX0PRakkOj3ls98aEbHM,26375
|
|
505
504
|
holado_test/scenario/tester_tools.py,sha256=Tv035FyXPjQ46Ep8KuPOjOvzJFvxnbv9EsrSihUzAwg,2479
|
|
505
|
+
holado_test/test_server/client/rest/test_server_client.py,sha256=TzvF2rwPz7PDcsZ5w-goN9O3pZVdDBZFN6GXD_KNCk8,4924
|
|
506
506
|
holado_test/test_server/server/Dockerfile,sha256=TR_xUU2YLmKYWeGUaRRZRhaBHKHa4Y_1nqQDquK843w,1744
|
|
507
507
|
holado_test/test_server/server/requirements.txt,sha256=c2iNG9IZZogAEC9oSWRTWEF9-OHW0vRtijPNK4P6_xY,45
|
|
508
|
-
holado_test/test_server/server/run_test_server_in_docker.sh,sha256=
|
|
508
|
+
holado_test/test_server/server/run_test_server_in_docker.sh,sha256=ISNvFT1dBM6aiw5Iv6yBhInn7L8ZYyz_7EDK_X1eCvk,3121
|
|
509
509
|
holado_test/test_server/server/core/server_context.py,sha256=aDl5rOJpxG9MT_jpymL0ST9z7FpoNOBAk5dLGAPGXas,1223
|
|
510
510
|
holado_test/test_server/server/core/server_manager.py,sha256=PW5ShUdnbdq6E3Ou87C5feXuJRc1V7qADkmGItLIi3A,2890
|
|
511
511
|
holado_test/test_server/server/rest/README,sha256=J_LIXWFxtxc8okQGZ8Kk0dMSRra9oUzbMP_ylCe4pTo,161
|
|
@@ -531,7 +531,7 @@ holado_value/common/tables/comparators/table_2_value_table_comparator.py,sha256=
|
|
|
531
531
|
holado_value/common/tables/comparators/table_2_value_table_row_comparator.py,sha256=_VglWUQWspG1Fo2iAo41auCwWYR24q0TniFck99BF_E,1752
|
|
532
532
|
holado_value/common/tables/comparators/table_2_value_table_with_header_comparator.py,sha256=VKwA7PbXnE-gFSKWlDCsJv0tkWVuNY-C4aWt2tyIybE,1911
|
|
533
533
|
holado_value/common/tables/converters/value_table_converter.py,sha256=o8r2VZytUAwBlT9yORL4i5gyPvgZNFhvjuPqv32cqgM,12397
|
|
534
|
-
holado_value/common/tools/unique_value_manager.py,sha256=
|
|
534
|
+
holado_value/common/tools/unique_value_manager.py,sha256=Go_su5Ju_pKp0y2YcrwWYTTMp_eXJIVPhy_uh2Izkkk,5287
|
|
535
535
|
holado_value/common/tools/value.py,sha256=BwAx9L_xHA-v4K55osnXjI9z9bQn_MKQ8Cvk3mhqBjA,9108
|
|
536
536
|
holado_value/common/tools/value_types.py,sha256=7nJp5D7xdoT9jMeeOxHIuPRykDyI9fXpve37ndK32gs,1801
|
|
537
537
|
holado_value/tests/behave/steps/__init__.py,sha256=BHp8TYE_X4lWn4B8A51nXSYaJlczuiDVJLcKMy7p0Lw,1267
|
|
@@ -552,9 +552,9 @@ test_holado/Dockerfile_test_holado,sha256=zO6OUFnC1X9ZG7fPWWWfcWgZwnxif4WDE4ZDEm
|
|
|
552
552
|
test_holado/__init__.py,sha256=TIHAHrF05rvz6-VDKuDBSBjasD6PxTxXvcXjMEC3D6E,54
|
|
553
553
|
test_holado/__main__.py,sha256=PVdCX8V_RGRzbQQKVxf7eyt8a10XfUJ1pcaajGgIlus,1509
|
|
554
554
|
test_holado/build_docker_image_to_test_holado_in_docker.sh,sha256=B3hbi0yKnEC-t9S18o6ZR27AU1bqiuptwOqm6H7tv8s,142
|
|
555
|
-
test_holado/environment.py,sha256=
|
|
555
|
+
test_holado/environment.py,sha256=wfVHsu_e67cjARLwmDsECbPH-yZN5WGJOeJj61-gmeM,2293
|
|
556
556
|
test_holado/initialize_holado.py,sha256=IPYH-GYNiHV5-7ZCCH6CFmPpmACsPrTV74TYz3MRjpA,3102
|
|
557
|
-
test_holado/logging.conf,sha256=
|
|
557
|
+
test_holado/logging.conf,sha256=au0QmrtF97ZxuVhgItHXdMLalkxAkxuWtgoOvGivfxc,1312
|
|
558
558
|
test_holado/test_holado_session_context.py,sha256=qOB_i2k8mYjkR3-q2uv0B04xFc1K3p-K20ttYwe1Z18,1364
|
|
559
559
|
test_holado/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
560
560
|
test_holado/features/NonReg/api/REST.feature,sha256=yAhCpWk7HbHztkdwkfcU-TrfnJVoOzHvYMmk9pUy50A,689
|
|
@@ -670,7 +670,7 @@ test_holado/tools/django/api_rest/api_rest/api1/serializers.py,sha256=o_YxFr-tgC
|
|
|
670
670
|
test_holado/tools/django/api_rest/api_rest/api1/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
|
|
671
671
|
test_holado/tools/django/api_rest/api_rest/api1/views.py,sha256=kOt2xT6bxO47_z__5yYR9kcYIWWv4qYzpX0K8Tqonik,758
|
|
672
672
|
test_holado/tools/django/api_rest/api_rest/api1/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
673
|
-
holado-0.9.
|
|
674
|
-
holado-0.9.
|
|
675
|
-
holado-0.9.
|
|
676
|
-
holado-0.9.
|
|
673
|
+
holado-0.9.1.dist-info/METADATA,sha256=9Gjc4KHiQekFKYnufDd17zR35GMrP3He5oDWCukuukw,7671
|
|
674
|
+
holado-0.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
|
675
|
+
holado-0.9.1.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
|
|
676
|
+
holado-0.9.1.dist-info/RECORD,,
|
holado_core/common/block/base.py
CHANGED
|
@@ -13,9 +13,9 @@
|
|
|
13
13
|
|
|
14
14
|
from builtins import super
|
|
15
15
|
import abc
|
|
16
|
-
from datetime import datetime
|
|
17
16
|
import logging
|
|
18
17
|
from holado_core.common.tools.tools import Tools
|
|
18
|
+
from holado_python.common.tools.datetime import DateTime
|
|
19
19
|
|
|
20
20
|
logger = logging.getLogger(__name__)
|
|
21
21
|
|
|
@@ -66,10 +66,10 @@ class BaseBlock(object):
|
|
|
66
66
|
raise NotImplementedError
|
|
67
67
|
|
|
68
68
|
def _process_start(self):
|
|
69
|
-
self.__start_dt =
|
|
69
|
+
self.__start_dt = DateTime.now()
|
|
70
70
|
|
|
71
71
|
def _process_end(self):
|
|
72
|
-
self.__end_dt =
|
|
72
|
+
self.__end_dt = DateTime.now()
|
|
73
73
|
|
|
74
74
|
|
|
75
75
|
|
|
@@ -189,7 +189,7 @@ class PathManager(object):
|
|
|
189
189
|
def get_timestamped_path(self, prefix, ext, dt=None, dt_format="%Y%m%d-%H%M%S"):
|
|
190
190
|
ext = ext.strip('.')
|
|
191
191
|
if dt is None:
|
|
192
|
-
dt =
|
|
192
|
+
dt = DateTime.now()
|
|
193
193
|
now_str = datetime.strftime(dt, dt_format)
|
|
194
194
|
return f"{prefix}_{now_str}.{ext}"
|
|
195
195
|
|
|
@@ -18,7 +18,7 @@ from django.contrib import admin
|
|
|
18
18
|
from django.urls import path
|
|
19
19
|
from rest_framework import routers
|
|
20
20
|
from django.urls.conf import include
|
|
21
|
-
from rest_api.application.apps import django_application_inst
|
|
21
|
+
from rest_api.application.apps import django_application_inst # @UnresolvedImport
|
|
22
22
|
from holado_core.common.exceptions.technical_exception import TechnicalException
|
|
23
23
|
|
|
24
24
|
router = routers.DefaultRouter()
|
|
@@ -19,7 +19,7 @@ import logging
|
|
|
19
19
|
from holado_test.scenario.step_tools import StepTools
|
|
20
20
|
from holado_test.behave.scenario.behave_step_tools import BehaveStepTools
|
|
21
21
|
from holado_value.common.tables.converters.value_table_converter import ValueTableConverter
|
|
22
|
-
from holado_docker.tools.docker_controller.
|
|
22
|
+
from holado_docker.tools.docker_controller.client.rest.docker_controller_client import DockerControllerClient
|
|
23
23
|
|
|
24
24
|
logger = logging.getLogger(__name__)
|
|
25
25
|
|
|
@@ -40,7 +40,7 @@ def step_impl(context, var_name):
|
|
|
40
40
|
else:
|
|
41
41
|
kwargs = {}
|
|
42
42
|
|
|
43
|
-
res =
|
|
43
|
+
res = DockerControllerClient.new_client(**kwargs)
|
|
44
44
|
|
|
45
45
|
__get_variable_manager().register_variable(var_name, res)
|
|
46
46
|
|
|
@@ -13,13 +13,50 @@
|
|
|
13
13
|
|
|
14
14
|
import logging
|
|
15
15
|
from holado_rest.api.rest.rest_client import RestClient
|
|
16
|
-
from holado.common.handlers.undefined import default_value
|
|
16
|
+
from holado.common.handlers.undefined import default_value, undefined_argument,\
|
|
17
|
+
undefined_value
|
|
18
|
+
import os
|
|
19
|
+
from holado_core.common.tools.converters.converter import Converter
|
|
20
|
+
from holado_rest.api.rest.rest_manager import RestManager
|
|
17
21
|
|
|
18
22
|
logger = logging.getLogger(__name__)
|
|
19
23
|
|
|
20
24
|
|
|
21
25
|
class DockerControllerClient(RestClient):
|
|
22
26
|
|
|
27
|
+
@classmethod
|
|
28
|
+
def new_client(cls, use_localhost=undefined_argument, **kwargs):
|
|
29
|
+
if 'name' not in kwargs:
|
|
30
|
+
kwargs['name'] = None
|
|
31
|
+
if 'url' not in kwargs:
|
|
32
|
+
if use_localhost is undefined_argument:
|
|
33
|
+
env_use = os.getenv("HOLADO_USE_LOCALHOST", False)
|
|
34
|
+
use_localhost = Converter.is_boolean(env_use) and Converter.to_boolean(env_use)
|
|
35
|
+
|
|
36
|
+
url = os.getenv("HOLADO_DOCKER_CONTROLLER_URL", undefined_value)
|
|
37
|
+
if url is undefined_value:
|
|
38
|
+
scheme = kwargs.get('scheme', undefined_value)
|
|
39
|
+
if scheme is undefined_value:
|
|
40
|
+
scheme = os.getenv("HOLADO_DOCKER_CONTROLLER_SCHEME", "http")
|
|
41
|
+
host = kwargs.get('host', undefined_value)
|
|
42
|
+
if host is undefined_value:
|
|
43
|
+
host = "localhost" if use_localhost else os.getenv("HOLADO_DOCKER_CONTROLLER_HOST", "holado_docker_controller")
|
|
44
|
+
port = kwargs.get('port', undefined_value)
|
|
45
|
+
if port is undefined_value:
|
|
46
|
+
port = os.getenv("HOLADO_DOCKER_CONTROLLER_PORT", 51231)
|
|
47
|
+
|
|
48
|
+
if port is None:
|
|
49
|
+
url = f"{scheme}://{host}"
|
|
50
|
+
else:
|
|
51
|
+
url = f"{scheme}://{host}:{port}"
|
|
52
|
+
kwargs['url'] = url
|
|
53
|
+
|
|
54
|
+
manager = RestManager(default_client_class=DockerControllerClient)
|
|
55
|
+
res = manager.new_client(**kwargs)
|
|
56
|
+
|
|
57
|
+
return res
|
|
58
|
+
|
|
59
|
+
|
|
23
60
|
def __init__(self, name, url, headers=None):
|
|
24
61
|
super().__init__(name, url, headers)
|
|
25
62
|
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
# Have access to any HolAdo registry.
|
|
13
13
|
#
|
|
14
14
|
# Optionally, define in .profile the following variables
|
|
15
|
-
# -
|
|
16
|
-
# - HOLADO_DOCKER_CONTROLLER_PORT: REST API port to use (default:
|
|
15
|
+
# - HOLADO_DOCKER_CONTROLLER_HOST: host name or name of the container
|
|
16
|
+
# - HOLADO_DOCKER_CONTROLLER_PORT: REST API port to use (default: 51231)
|
|
17
17
|
# - HOLADO_IMAGE_REGISTRY: docker image registry to use (default: holado/docker_controller)
|
|
18
18
|
# - HOLADO_IMAGE_TAG: docker image tag to use (default: latest)
|
|
19
19
|
# - HOLADO_OUTPUT_BASEDIR: absolute path to base output directory (default: [HOME]/.holado/output)
|
|
@@ -75,7 +75,7 @@ fi
|
|
|
75
75
|
|
|
76
76
|
# Define port to use
|
|
77
77
|
if [[ -z "$HOLADO_DOCKER_CONTROLLER_PORT" ]]; then
|
|
78
|
-
HOLADO_DOCKER_CONTROLLER_PORT=
|
|
78
|
+
HOLADO_DOCKER_CONTROLLER_PORT=51231
|
|
79
79
|
fi
|
|
80
80
|
|
|
81
81
|
|
|
@@ -12,13 +12,13 @@ source_path = os.path.normpath(os.path.join(here, 'src'))
|
|
|
12
12
|
sys.path.insert(0, source_path)
|
|
13
13
|
|
|
14
14
|
# Add HolAdo source paths (needed when using a clone of HolAdo project)
|
|
15
|
-
from initialize_holado import insert_holado_source_paths
|
|
15
|
+
from initialize_holado import insert_holado_source_paths # @UnresolvedImport
|
|
16
16
|
insert_holado_source_paths()
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
# Configure HolAdo
|
|
20
20
|
import holado
|
|
21
|
-
from context.session_context import TSSessionContext
|
|
21
|
+
from context.session_context import TSSessionContext # @UnresolvedImport
|
|
22
22
|
# holado.initialize(TSessionContext=TSSessionContext,
|
|
23
23
|
holado.initialize(TSessionContext=None,
|
|
24
24
|
logging_config_file_path=os.path.join(here, 'logging.conf'), log_level=logging.INFO,
|
|
@@ -26,7 +26,7 @@ holado.initialize(TSessionContext=None,
|
|
|
26
26
|
|
|
27
27
|
|
|
28
28
|
# Import generic environment methods
|
|
29
|
-
from behave_environment import *
|
|
29
|
+
from behave_environment import * # @UnresolvedImport
|
|
30
30
|
|
|
31
31
|
# Define project specific environment methods
|
|
32
32
|
# TestConfig.profile_memory_in_features = True
|
|
@@ -17,7 +17,7 @@ class TSSessionContext(SessionContext):
|
|
|
17
17
|
|
|
18
18
|
# Override default registered modules
|
|
19
19
|
|
|
20
|
-
from common.tools.path_manager import TSPathManager
|
|
20
|
+
from common.tools.path_manager import TSPathManager # @UnresolvedImport
|
|
21
21
|
self.services.register_service_type("path_manager", TSPathManager,
|
|
22
22
|
lambda m: m.initialize(),
|
|
23
23
|
raise_if_exist=False )
|
|
@@ -25,7 +25,7 @@ class TSSessionContext(SessionContext):
|
|
|
25
25
|
|
|
26
26
|
# Register new modules
|
|
27
27
|
|
|
28
|
-
from config.config_manager import TSConfigManager
|
|
28
|
+
from config.config_manager import TSConfigManager # @UnresolvedImport
|
|
29
29
|
self.services.register_service_type("config_manager", TSConfigManager,
|
|
30
30
|
lambda m: m.initialize(lambda: self.path_manager) )
|
|
31
31
|
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import logging
|
|
4
4
|
from holado_test.behave.behave import * # @UnusedWildImport
|
|
5
5
|
from holado.common.context.session_context import SessionContext
|
|
6
|
-
from config.config_manager import TSConfigManager
|
|
6
|
+
from config.config_manager import TSConfigManager # @UnresolvedImport
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
logger = logging.getLogger(__name__)
|
|
@@ -13,10 +13,10 @@
|
|
|
13
13
|
|
|
14
14
|
import threading
|
|
15
15
|
import time
|
|
16
|
-
import datetime
|
|
17
16
|
import logging
|
|
18
17
|
import holado_multitask.multithreading.thread as ctt
|
|
19
18
|
from holado.common.handlers.undefined import default_context
|
|
19
|
+
from holado_python.common.tools.datetime import DateTime
|
|
20
20
|
|
|
21
21
|
logger = logging.getLogger(__name__)
|
|
22
22
|
|
|
@@ -31,7 +31,7 @@ class LoopThread(ctt.InterruptableThread):
|
|
|
31
31
|
|
|
32
32
|
# Manage loops
|
|
33
33
|
self.__is_under_loop = threading.Event()
|
|
34
|
-
self.__next_loop_datetime =
|
|
34
|
+
self.__next_loop_datetime = DateTime.now()
|
|
35
35
|
self.__loop_counter = 0
|
|
36
36
|
|
|
37
37
|
@property
|
|
@@ -79,10 +79,10 @@ class LoopThread(ctt.InterruptableThread):
|
|
|
79
79
|
logger.info("Loop thread '{}' has finished.".format(self.name))
|
|
80
80
|
|
|
81
81
|
def does_need_run_loop(self):
|
|
82
|
-
return
|
|
82
|
+
return DateTime.now() >= self.__next_loop_datetime
|
|
83
83
|
|
|
84
84
|
def _get_sleep_time_before_next_loop(self):
|
|
85
|
-
now =
|
|
85
|
+
now = DateTime.now()
|
|
86
86
|
if now < self.__next_loop_datetime:
|
|
87
87
|
delta = self.__next_loop_datetime - now
|
|
88
88
|
res = delta.total_seconds()
|