shixiong/okd @ 7df38035f5e20d49d6cd5eb7a3310070a63a2f78

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