Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove six[4]"

Browse Source
This commit is contained in:
Zuul
2020-04-18 09:26:34 +00:00
committed by Gerrit Code Review
parent 7591beb65d 6a6dbc1491
commit 0aa5bb3265
8 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
watcher/tests/db/test_action.py
View File

@@ -16,7 +16,6 @@
"""Tests for manipulating Action via the DB API"""
import freezegun
import six
from watcher.common import exception
from watcher.common import utils as w_utils
@@ -237,7 +236,7 @@ class DbActionTestCase(base.DbTestCase):
uuids = []
for _ in range(1, 4):
action = utils.create_test_action(uuid=w_utils.generate_uuid())
uuids.append(six.text_type(action['uuid']))
uuids.append(str(action['uuid']))
actions = self.dbapi.get_action_list(self.context)
action_uuids = [a.uuid for a in actions]
self.assertEqual(3, len(action_uuids))
@@ -254,7 +253,7 @@ class DbActionTestCase(base.DbTestCase):
action = utils.create_test_action(
id=i, uuid=w_utils.generate_uuid(),
action_plan_id=action_plan.id)
uuids.append(six.text_type(action['uuid']))
uuids.append(str(action['uuid']))
actions = self.dbapi.get_action_list(self.context, eager=True)
action_map = {a.uuid: a for a in actions}
self.assertEqual(sorted(uuids), sorted(action_map.keys()))

5
watcher/tests/db/test_action_plan.py
View File

@@ -16,7 +16,6 @@
"""Tests for manipulating ActionPlan via the DB API"""
import freezegun
import six
from watcher.common import exception
from watcher.common import utils as w_utils
@@ -235,7 +234,7 @@ class DbActionPlanTestCase(base.DbTestCase):
for _ in range(1, 4):
action_plan = utils.create_test_action_plan(
uuid=w_utils.generate_uuid())
uuids.append(six.text_type(action_plan['uuid']))
uuids.append(str(action_plan['uuid']))
action_plans = self.dbapi.get_action_plan_list(self.context)
action_plan_uuids = [ap.uuid for ap in action_plans]
self.assertEqual(sorted(uuids), sorted(action_plan_uuids))
@@ -253,7 +252,7 @@ class DbActionPlanTestCase(base.DbTestCase):
for _ in range(1, 4):
action_plan = utils.create_test_action_plan(
uuid=w_utils.generate_uuid())
uuids.append(six.text_type(action_plan['uuid']))
uuids.append(str(action_plan['uuid']))
action_plans = self.dbapi.get_action_plan_list(
self.context, eager=True)
action_plan_map = {a.uuid: a for a in action_plans}

5
watcher/tests/db/test_audit.py
View File

@@ -16,7 +16,6 @@
"""Tests for manipulating Audit via the DB API"""
import freezegun
import six
from watcher.common import exception
from watcher.common import utils as w_utils
@@ -273,7 +272,7 @@ class DbAuditTestCase(base.DbTestCase):
for id_ in range(1, 4):
audit = utils.create_test_audit(uuid=w_utils.generate_uuid(),
name='My Audit {0}'.format(id_))
uuids.append(six.text_type(audit['uuid']))
uuids.append(str(audit['uuid']))
audits = self.dbapi.get_audit_list(self.context)
audit_uuids = [a.uuid for a in audits]
self.assertEqual(sorted(uuids), sorted(audit_uuids))
@@ -293,7 +292,7 @@ class DbAuditTestCase(base.DbTestCase):
id=i, uuid=w_utils.generate_uuid(),
name='My Audit {0}'.format(i),
goal_id=goal.id, strategy_id=strategy.id)
uuids.append(six.text_type(audit['uuid']))
uuids.append(str(audit['uuid']))
audits = self.dbapi.get_audit_list(self.context, eager=True)
audit_map = {a.uuid: a for a in audits}
self.assertEqual(sorted(uuids), sorted(audit_map.keys()))

5
watcher/tests/db/test_audit_template.py
View File

@@ -16,7 +16,6 @@
"""Tests for manipulating AuditTemplate via the DB API"""
import freezegun
import six
from watcher.common import exception
from watcher.common import utils as w_utils
@@ -235,7 +234,7 @@ class DbAuditTemplateTestCase(base.DbTestCase):
id=i,
uuid=w_utils.generate_uuid(),
name='My Audit Template {0}'.format(i))
uuids.append(six.text_type(audit_template['uuid']))
uuids.append(str(audit_template['uuid']))
audit_templates = self.dbapi.get_audit_template_list(self.context)
audit_template_uuids = [at.uuid for at in audit_templates]
self.assertEqual(sorted(uuids), sorted(audit_template_uuids))
@@ -255,7 +254,7 @@ class DbAuditTemplateTestCase(base.DbTestCase):
id=i, uuid=w_utils.generate_uuid(),
name='My Audit Template {0}'.format(i),
goal_id=goal.id, strategy_id=strategy.id)
uuids.append(six.text_type(audit_template['uuid']))
uuids.append(str(audit_template['uuid']))
audit_templates = self.dbapi.get_audit_template_list(
self.context, eager=True)
audit_template_map = {a.uuid: a for a in audit_templates}

5
watcher/tests/db/test_efficacy_indicator.py
View File

@@ -16,7 +16,6 @@
"""Tests for manipulating EfficacyIndicator via the DB API"""
import freezegun
import six
from watcher.common import exception
from watcher.common import utils as w_utils
@@ -249,7 +248,7 @@ class DbEfficacyIndicatorTestCase(base.DbTestCase):
efficacy_indicator = utils.create_test_efficacy_indicator(
action_plan_id=action_plan.id, id=id_, uuid=None,
name="efficacy_indicator", description="Test Indicator ")
uuids.append(six.text_type(efficacy_indicator['uuid']))
uuids.append(str(efficacy_indicator['uuid']))
efficacy_indicators = self.dbapi.get_efficacy_indicator_list(
self.context)
efficacy_indicator_uuids = [ei.uuid for ei in efficacy_indicators]
@@ -266,7 +265,7 @@ class DbEfficacyIndicatorTestCase(base.DbTestCase):
efficacy_indicator = utils.create_test_efficacy_indicator(
id=i, uuid=w_utils.generate_uuid(),
action_plan_id=action_plan.id)
uuids.append(six.text_type(efficacy_indicator['uuid']))
uuids.append(str(efficacy_indicator['uuid']))
efficacy_indicators = self.dbapi.get_efficacy_indicator_list(
self.context, eager=True)
efficacy_indicator_map = {a.uuid: a for a in efficacy_indicators}

3
watcher/tests/db/test_goal.py
View File

@@ -16,7 +16,6 @@
"""Tests for manipulating Goal via the DB API"""
import freezegun
import six
from watcher.common import exception
from watcher.common import utils as w_utils
@@ -231,7 +230,7 @@ class DbGoalTestCase(base.DbTestCase):
uuid=w_utils.generate_uuid(),
name="GOAL_%s" % i,
display_name='My Goal %s' % i)
uuids.append(six.text_type(goal['uuid']))
uuids.append(str(goal['uuid']))
goals = self.dbapi.get_goal_list(self.context)
goal_uuids = [g.uuid for g in goals]
self.assertEqual(sorted(uuids), sorted(goal_uuids))

3
watcher/tests/db/test_scoring_engine.py
View File

@@ -18,7 +18,6 @@
"""Tests for manipulating ScoringEngine via the DB API"""
import freezegun
import six
from watcher.common import exception
from watcher.common import utils as w_utils
@@ -237,7 +236,7 @@ class DbScoringEngineTestCase(base.DbTestCase):
name="SE_ID_%s" % i,
description='My ScoringEngine {0}'.format(i),
metainfo='a{0}=b{0}'.format(i))
names.append(six.text_type(scoring_engine['name']))
names.append(str(scoring_engine['name']))
scoring_engines = self.dbapi.get_scoring_engine_list(self.context)
scoring_engines_names = [se.name for se in scoring_engines]
self.assertEqual(sorted(names), sorted(scoring_engines_names))

5
watcher/tests/db/test_strategy.py
View File

@@ -18,7 +18,6 @@
"""Tests for manipulating Strategy via the DB API"""
import freezegun
import six
from watcher.common import exception
from watcher.common import utils as w_utils
@@ -247,7 +246,7 @@ class DbStrategyTestCase(base.DbTestCase):
uuid=w_utils.generate_uuid(),
name="STRATEGY_ID_%s" % i,
display_name='My Strategy {0}'.format(i))
uuids.append(six.text_type(strategy['uuid']))
uuids.append(str(strategy['uuid']))
strategies = self.dbapi.get_strategy_list(self.context)
strategy_uuids = [s.uuid for s in strategies]
self.assertEqual(sorted(uuids), sorted(strategy_uuids))
@@ -265,7 +264,7 @@ class DbStrategyTestCase(base.DbTestCase):
name="STRATEGY_ID_%s" % i,
display_name='My Strategy {0}'.format(i),
goal_id=goal.id)
uuids.append(six.text_type(strategy['uuid']))
uuids.append(str(strategy['uuid']))
strategys = self.dbapi.get_strategy_list(self.context, eager=True)
strategy_map = {a.uuid: a for a in strategys}
self.assertEqual(sorted(uuids), sorted(strategy_map.keys()))