summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
diff options
context:
space:
mode:
authorRodolfo Carvalho <rhcarvalho@gmail.com>2017-02-18 04:25:32 +0100
committerRodolfo Carvalho <rhcarvalho@gmail.com>2017-02-20 17:13:52 +0100
commit95f11aa9410c8db4794b51932931e6ee3da46402 (patch)
tree44738bd6e8a69000743fad7205823fe522994cde /roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
parentc008153397d5a34a21301cb5dabb6fe27df2fe47 (diff)
downloadopenshift-95f11aa9410c8db4794b51932931e6ee3da46402.tar.gz
openshift-95f11aa9410c8db4794b51932931e6ee3da46402.tar.bz2
openshift-95f11aa9410c8db4794b51932931e6ee3da46402.tar.xz
openshift-95f11aa9410c8db4794b51932931e6ee3da46402.zip
Make tests run with either nosetests or pytest
And remove explicit dependencies on nose, replacing with pytest. The former is the way forward, for it is a better maintained test library, and a transitive dependency of `molecule`, the test framework we're using to add integration tests to this repo (work in progress).
Diffstat (limited to 'roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py')
-rw-r--r--roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py b/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
index d27a48ede..4fb900b98 100644
--- a/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
+++ b/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
@@ -74,13 +74,12 @@ TEST_VARS = [
class TestOpenShiftMasterFactsDefaultPredicates(object):
- def setUp(self):
- self.lookup = LookupModule()
- self.default_facts = {
- 'openshift': {
- 'common': {}
- }
+ lookup = LookupModule()
+ default_facts = {
+ 'openshift': {
+ 'common': {}
}
+ }
def test_openshift_version(self):
for zones_enabled in (True, False):