Skip to content

Commit

Permalink
Replace assert_equal with plain assert
Browse files Browse the repository at this point in the history 
In the intention to remove the dependency on nose and use only pytest.
  • Loading branch information
@rhcarvalho
rhcarvalho committed Feb 20, 2017
1 parent e7b4e49 commit c008153
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 28 deletions.
26 changes: 12 additions & 14 deletions roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
import os
import sys

from nose.tools import assert_equal

sys.path.insert(1, os.path.join(os.path.dirname(__file__), os.pardir, "lookup_plugins"))

from openshift_master_facts_default_predicates import LookupModule # noqa: E402
Expand Down Expand Up @@ -110,9 +108,9 @@ def check_defaults_version(self, version, deployment_type, default_predicates,
results = self.lookup.run(None, variables=facts,
regions_enabled=regions_enabled)
if regions_enabled:
assert_equal(results, default_predicates + [REGION_PREDICATE])
assert results == default_predicates + [REGION_PREDICATE]
else:
assert_equal(results, default_predicates)
assert results == default_predicates

def test_release_defaults(self):
for regions_enabled in (True, False):
Expand All @@ -137,9 +135,9 @@ def check_defaults_release(self, release, deployment_type, default_predicates,
results = self.lookup.run(None, variables=facts,
regions_enabled=regions_enabled)
if regions_enabled:
assert_equal(results, default_predicates + [REGION_PREDICATE])
assert results == default_predicates + [REGION_PREDICATE]
else:
assert_equal(results, default_predicates)
assert results == default_predicates

def test_short_version_defaults(self):
for regions_enabled in (True, False):
Expand All @@ -154,9 +152,9 @@ def check_defaults_short_version(self, short_version, deployment_type, default_p
results = self.lookup.run(None, variables=facts,
regions_enabled=regions_enabled)
if regions_enabled:
assert_equal(results, default_predicates + [REGION_PREDICATE])
assert results == default_predicates + [REGION_PREDICATE]
else:
assert_equal(results, default_predicates)
assert results == default_predicates

def test_short_version_kwarg(self):
for regions_enabled in (True, False):
Expand All @@ -171,9 +169,9 @@ def check_defaults_short_version_kwarg(self, short_version, deployment_type, def
regions_enabled=regions_enabled,
short_version=short_version)
if regions_enabled:
assert_equal(results, default_predicates + [REGION_PREDICATE])
assert results == default_predicates + [REGION_PREDICATE]
else:
assert_equal(results, default_predicates)
assert results == default_predicates

def test_deployment_type_kwarg(self):
for regions_enabled in (True, False):
Expand All @@ -188,9 +186,9 @@ def check_defaults_deployment_type_kwarg(self, short_version, deployment_type,
regions_enabled=regions_enabled,
deployment_type=deployment_type)
if regions_enabled:
assert_equal(results, default_predicates + [REGION_PREDICATE])
assert results == default_predicates + [REGION_PREDICATE]
else:
assert_equal(results, default_predicates)
assert results == default_predicates

def test_only_kwargs(self):
for regions_enabled in (True, False):
Expand All @@ -205,6 +203,6 @@ def check_defaults_only_kwargs(self, short_version, deployment_type,
short_version=short_version,
deployment_type=deployment_type)
if regions_enabled:
assert_equal(results, default_predicates + [REGION_PREDICATE])
assert results == default_predicates + [REGION_PREDICATE]
else:
assert_equal(results, default_predicates)
assert results == default_predicates
26 changes: 12 additions & 14 deletions roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
import os
import sys

from nose.tools import assert_equal

sys.path.insert(1, os.path.join(os.path.dirname(__file__), os.pardir, "lookup_plugins"))

from openshift_master_facts_default_priorities import LookupModule # noqa: E402
Expand Down Expand Up @@ -97,9 +95,9 @@ def check_defaults_version(self, version, deployment_type, default_priorities,
facts['openshift']['common']['deployment_type'] = deployment_type
results = self.lookup.run(None, variables=facts, zones_enabled=zones_enabled)
if zones_enabled:
assert_equal(results, default_priorities + [ZONE_PRIORITY])
assert results == default_priorities + [ZONE_PRIORITY]
else:
assert_equal(results, default_priorities)
assert results == default_priorities

def test_release_defaults(self):
for zones_enabled in (True, False):
Expand All @@ -123,9 +121,9 @@ def check_defaults_release(self, release, deployment_type, default_priorities,
facts['openshift']['common']['deployment_type'] = deployment_type
results = self.lookup.run(None, variables=facts, zones_enabled=zones_enabled)
if zones_enabled:
assert_equal(results, default_priorities + [ZONE_PRIORITY])
assert results == default_priorities + [ZONE_PRIORITY]
else:
assert_equal(results, default_priorities)
assert results == default_priorities

def test_short_version_defaults(self):
for zones_enabled in (True, False):
Expand All @@ -139,9 +137,9 @@ def check_defaults_short_version(self, short_version, deployment_type,
facts['openshift']['common']['deployment_type'] = deployment_type
results = self.lookup.run(None, variables=facts, zones_enabled=zones_enabled)
if zones_enabled:
assert_equal(results, default_priorities + [ZONE_PRIORITY])
assert results == default_priorities + [ZONE_PRIORITY]
else:
assert_equal(results, default_priorities)
assert results == default_priorities

def test_short_version_kwarg(self):
for zones_enabled in (True, False):
Expand All @@ -156,9 +154,9 @@ def check_defaults_short_version_kwarg(self, short_version, deployment_type,
zones_enabled=zones_enabled,
short_version=short_version)
if zones_enabled:
assert_equal(results, default_priorities + [ZONE_PRIORITY])
assert results == default_priorities + [ZONE_PRIORITY]
else:
assert_equal(results, default_priorities)
assert results == default_priorities

def test_deployment_type_kwarg(self):
for zones_enabled in (True, False):
Expand All @@ -173,9 +171,9 @@ def check_defaults_deployment_type_kwarg(self, short_version, deployment_type,
zones_enabled=zones_enabled,
deployment_type=deployment_type)
if zones_enabled:
assert_equal(results, default_priorities + [ZONE_PRIORITY])
assert results == default_priorities + [ZONE_PRIORITY]
else:
assert_equal(results, default_priorities)
assert results == default_priorities

def test_only_kwargs(self):
for zones_enabled in (True, False):
Expand All @@ -190,6 +188,6 @@ def check_defaults_only_kwargs(self, short_version, deployment_type,
short_version=short_version,
deployment_type=deployment_type)
if zones_enabled:
assert_equal(results, default_priorities + [ZONE_PRIORITY])
assert results == default_priorities + [ZONE_PRIORITY]
else:
assert_equal(results, default_priorities)
assert results == default_priorities

0 comments on commit c008153

Please sign in to comment.