From f169e60e41b73bf26df6af1991d9fb8395687a12 Mon Sep 17 00:00:00 2001
From: Carsten Patzke <carsten.patzke@desy.de>
Date: Mon, 11 Oct 2021 13:30:04 +0200
Subject: [PATCH] Monitoring: Fixed parameters in python producer test calls
---
.../frozen_versions/21.06.0/getting_started/python/produce.py | 2 +-
docs/site/examples/getting_started/python/produce.py | 2 +-
.../bugfix_callback.py | 2 +-
tests/automatic/producer/aai/producer_aai.py | 2 +-
tests/automatic/producer/python_api/producer_api.py | 4 ++--
tests/manual/python_tests/producer/short_test.py | 2 +-
tests/manual/python_tests/producer/test.py | 2 +-
tests/manual/python_tests/producer_wait_bug_mongo/test.py | 2 +-
.../manual/python_tests/producer_wait_threads/producer_api.py | 4 ++--
tests/manual/python_tests/producer_wait_threads/test.py | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/docs/site/examples/frozen_versions/21.06.0/getting_started/python/produce.py b/docs/site/examples/frozen_versions/21.06.0/getting_started/python/produce.py
index 063ec05fa..66f835f20 100644
--- a/docs/site/examples/frozen_versions/21.06.0/getting_started/python/produce.py
+++ b/docs/site/examples/frozen_versions/21.06.0/getting_started/python/produce.py
@@ -10,7 +10,7 @@ endpoint = "localhost:8400"
beamtime = "asapo_test"
# source type 'processed' to write to the core filesystem
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',
beamtime,'auto','test_source','', 1,60000)
# we are sending a message with with index 1 to the default stream. Filename must start with processed/
diff --git a/docs/site/examples/getting_started/python/produce.py b/docs/site/examples/getting_started/python/produce.py
index 063ec05fa..66f835f20 100644
--- a/docs/site/examples/getting_started/python/produce.py
+++ b/docs/site/examples/getting_started/python/produce.py
@@ -10,7 +10,7 @@ endpoint = "localhost:8400"
beamtime = "asapo_test"
# source type 'processed' to write to the core filesystem
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',
beamtime,'auto','test_source','', 1,60000)
# we are sending a message with with index 1 to the default stream. Filename must start with processed/
diff --git a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/bugfix_callback.py b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/bugfix_callback.py
index dff37d791..1c6653284 100644
--- a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/bugfix_callback.py
+++ b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/bugfix_callback.py
@@ -25,7 +25,7 @@ class AsapoSender:
def _callback(self, header, err):
print ("hello self callback")
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads, 600000)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads, 600000)
producer.set_log_level("debug")
print(asapo_producer.__version__)
diff --git a/tests/automatic/producer/aai/producer_aai.py b/tests/automatic/producer/aai/producer_aai.py
index 9d350bee4..2ddf0c99c 100644
--- a/tests/automatic/producer/aai/producer_aai.py
+++ b/tests/automatic/producer/aai/producer_aai.py
@@ -27,7 +27,7 @@ def callback(header,err):
lock.release()
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed','auto',beamline, data_source, token, nthreads, 60000)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto','auto',beamline, data_source, token, nthreads, 60000)
producer.set_log_level("debug")
diff --git a/tests/automatic/producer/python_api/producer_api.py b/tests/automatic/producer/python_api/producer_api.py
index 3208d64bf..3ad913e58 100644
--- a/tests/automatic/producer/python_api/producer_api.py
+++ b/tests/automatic/producer/python_api/producer_api.py
@@ -47,7 +47,7 @@ def assert_version(version):
if not ok:
sys.exit(1)
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed', beamtime, 'auto', data_source, token, nthreads, 60000)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto', beamtime, 'auto', data_source, token, nthreads, 60000)
producer.set_log_level("debug")
@@ -233,7 +233,7 @@ else:
# create with error
try:
- producer = asapo_producer.create_producer(endpoint,'auto','auto','processed', beamtime, 'auto', data_source, token, 0, 0)
+ producer = asapo_producer.create_producer(endpoint,'processed','auto','auto', beamtime, 'auto', data_source, token, 0, 0)
except asapo_producer.AsapoWrongInputError as e:
print(e)
else:
diff --git a/tests/manual/python_tests/producer/short_test.py b/tests/manual/python_tests/producer/short_test.py
index 983225d62..61e5bc462 100644
--- a/tests/manual/python_tests/producer/short_test.py
+++ b/tests/manual/python_tests/producer/short_test.py
@@ -26,7 +26,7 @@ def assert_err(err):
print(err)
sys.exit(1)
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads ,0)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads ,0)
producer.set_log_level("debug")
diff --git a/tests/manual/python_tests/producer/test.py b/tests/manual/python_tests/producer/test.py
index 1bb1c5dd8..9cc83aaf9 100644
--- a/tests/manual/python_tests/producer/test.py
+++ b/tests/manual/python_tests/producer/test.py
@@ -27,7 +27,7 @@ def assert_err(err):
print(err)
sys.exit(1)
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads ,0)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads ,0)
producer.set_log_level("info")
diff --git a/tests/manual/python_tests/producer_wait_bug_mongo/test.py b/tests/manual/python_tests/producer_wait_bug_mongo/test.py
index b622a4e8d..c1883d3cb 100644
--- a/tests/manual/python_tests/producer_wait_bug_mongo/test.py
+++ b/tests/manual/python_tests/producer_wait_bug_mongo/test.py
@@ -27,7 +27,7 @@ def assert_err(err):
print(err)
sys.exit(1)
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads, 600000)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads, 600000)
producer.set_log_level("debug")
diff --git a/tests/manual/python_tests/producer_wait_threads/producer_api.py b/tests/manual/python_tests/producer_wait_threads/producer_api.py
index 2f0acbd52..943216741 100644
--- a/tests/manual/python_tests/producer_wait_threads/producer_api.py
+++ b/tests/manual/python_tests/producer_wait_threads/producer_api.py
@@ -22,7 +22,7 @@ def callback(header,err):
print ("successfuly sent: ",header)
lock.release()
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime, 'auto', data_source, token, nthreads, 600000)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime, 'auto', data_source, token, nthreads, 600000)
producer.set_log_level("info")
@@ -63,7 +63,7 @@ if n!=0:
# create with error
try:
- producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, 0, 600000)
+ producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, 0, 600000)
except Exception as Asapo:
print(e)
else:
diff --git a/tests/manual/python_tests/producer_wait_threads/test.py b/tests/manual/python_tests/producer_wait_threads/test.py
index bd802d385..8e969b6fd 100644
--- a/tests/manual/python_tests/producer_wait_threads/test.py
+++ b/tests/manual/python_tests/producer_wait_threads/test.py
@@ -22,7 +22,7 @@ def callback(header,err):
print ("successfuly sent: ",header)
lock.release()
-producer = asapo_producer.create_producer(endpoint,'auto','auto','processed',beamtime,'auto', data_source, token, nthreads, 600000)
+producer = asapo_producer.create_producer(endpoint,'processed','auto','auto',beamtime,'auto', data_source, token, nthreads, 600000)
producer.set_log_level("info")
--
GitLab