shixiong/okd @ 4f9b26e8af5890b7960291497020586426e7f1fc

Steve Kuznetsov 553a9ce216 Update version checks to tolerate 3.7		7 rokov pred
..
conftest.py	e174c88d86 Remove unused argument	8 rokov pred
openshift_master_facts_bad_input_tests.py	95f11aa941 Make tests run with either nosetests or pytest	8 rokov pred
openshift_master_facts_default_predicates_tests.py	51ffcb739c Standardize all Origin versioning on 3.6	8 rokov pred
openshift_master_facts_default_priorities_tests.py	553a9ce216 Update version checks to tolerate 3.7	7 rokov pred