diff --git a/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py b/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py index 19c7f761de6..e9220835407 100644 --- a/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py +++ b/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py @@ -43,7 +43,7 @@ class MonitoringDB(ElasticDB): """Extension of ElasticDB for Monitoring system DB""" - def __init__(self, name="Monitoring/MonitoringDB", readOnly=False): + def __init__(self, name="Monitoring/MonitoringDB"): """Standard constructor""" try: @@ -55,7 +55,6 @@ def __init__(self, name="Monitoring/MonitoringDB", readOnly=False): self.log.error("Can't connect to MonitoringDB", repr(ex)) raise ex - self.__readonly = readOnly self.documentTypes = {} # loads all monitoring indexes and types. diff --git a/tests/Integration/Core/Test_ElasticsearchDB.py b/tests/Integration/Core/Test_ElasticsearchDB.py index b89938c7a60..66b0c688bc8 100644 --- a/tests/Integration/Core/Test_ElasticsearchDB.py +++ b/tests/Integration/Core/Test_ElasticsearchDB.py @@ -496,8 +496,10 @@ def test_Search(): # assertEqual(result.aggregations['2'].buckets[1]['end_data'].buckets[0].avg_buckets, {u'value': 4}) @pytest.fixture def setUpAndTearDown(): - result = elasticSearchDB.createIndex("my-index", {}) - assert result["OK"] + res = elasticSearchDB.existingIndex("my-index") + if not res["OK"] or not res["Value"]: + result = elasticSearchDB.createIndex("my-index", {}) + assert result["OK"] result = elasticSearchDB.index( indexName="my-index", body={"quantity": 1, "Product": "a", "timestamp": 1458226213000}, docID=1 )