@@ -795,7 +795,6 @@ def tearDown(self):
795
795
os .unlink (self .config_file_1 )
796
796
os .unlink (self .config_file_2 )
797
797
798
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
799
798
def test (self ):
800
799
self .config .from_yaml (self .config_file_1 )
801
800
@@ -805,7 +804,6 @@ def test(self):
805
804
self .assertEqual (self .config .section2 (), {"value2" : 2 })
806
805
self .assertEqual (self .config .section2 .value2 (), 2 )
807
806
808
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
809
807
def test_merge (self ):
810
808
self .config .from_yaml (self .config_file_1 )
811
809
self .config .from_yaml (self .config_file_2 )
@@ -833,45 +831,37 @@ def test_merge(self):
833
831
self .assertEqual (self .config .section3 (), {"value3" : 3 })
834
832
self .assertEqual (self .config .section3 .value3 (), 3 )
835
833
836
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
837
834
def test_file_does_not_exist (self ):
838
835
self .config .from_yaml ("./does_not_exist.yml" )
839
836
self .assertEqual (self .config (), {})
840
837
841
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
842
838
def test_file_does_not_exist_strict_mode (self ):
843
839
self .config = providers .Configuration (strict = True )
844
840
with self .assertRaises (IOError ):
845
841
self .config .from_yaml ("./does_not_exist.yml" )
846
842
847
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
848
843
def test_option_file_does_not_exist (self ):
849
844
self .config .option .from_yaml ("./does_not_exist.yml" )
850
845
self .assertIsNone (self .config .option ())
851
846
852
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
853
847
def test_option_file_does_not_exist_strict_mode (self ):
854
848
self .config = providers .Configuration (strict = True )
855
849
with self .assertRaises (IOError ):
856
850
self .config .option .from_yaml ("./does_not_exist.yml" )
857
851
858
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
859
852
def test_required_file_does_not_exist (self ):
860
853
with self .assertRaises (IOError ):
861
854
self .config .from_yaml ("./does_not_exist.yml" , required = True )
862
855
863
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
864
856
def test_required_option_file_does_not_exist (self ):
865
857
with self .assertRaises (IOError ):
866
858
self .config .option .from_yaml ("./does_not_exist.yml" , required = True )
867
859
868
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
869
860
def test_not_required_file_does_not_exist_strict_mode (self ):
870
861
self .config = providers .Configuration (strict = True )
871
862
self .config .from_yaml ("./does_not_exist.yml" , required = False )
872
863
self .assertEqual (self .config (), {})
873
864
874
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
875
865
def test_not_required_option_file_does_not_exist_strict_mode (self ):
876
866
self .config = providers .Configuration (strict = True )
877
867
self .config .option .from_yaml ("./does_not_exist.yml" , required = False )
@@ -943,7 +933,6 @@ def tearDown(self):
943
933
os .environ .pop ("CONFIG_TEST_PATH" , None )
944
934
os .unlink (self .config_file )
945
935
946
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
947
936
def test_env_variable_interpolation (self ):
948
937
self .config .from_yaml (self .config_file )
949
938
@@ -966,7 +955,6 @@ def test_env_variable_interpolation(self):
966
955
self .assertEqual (self .config .section1 .value1 (), "test-value" )
967
956
self .assertEqual (self .config .section1 .value2 (), "test-path/path" )
968
957
969
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
970
958
def test_missing_envs_not_required (self ):
971
959
del os .environ ["CONFIG_TEST_ENV" ]
972
960
del os .environ ["CONFIG_TEST_PATH" ]
@@ -992,7 +980,6 @@ def test_missing_envs_not_required(self):
992
980
self .assertIsNone (self .config .section1 .value1 ())
993
981
self .assertEqual (self .config .section1 .value2 (), "/path" )
994
982
995
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
996
983
def test_missing_envs_required (self ):
997
984
with open (self .config_file , "w" ) as config_file :
998
985
config_file .write (
@@ -1008,7 +995,6 @@ def test_missing_envs_required(self):
1008
995
"Missing required environment variable \" UNDEFINED\" " ,
1009
996
)
1010
997
1011
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
1012
998
def test_missing_envs_strict_mode (self ):
1013
999
with open (self .config_file , "w" ) as config_file :
1014
1000
config_file .write (
@@ -1025,7 +1011,6 @@ def test_missing_envs_strict_mode(self):
1025
1011
"Missing required environment variable \" UNDEFINED\" " ,
1026
1012
)
1027
1013
1028
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
1029
1014
def test_option_missing_envs_not_required (self ):
1030
1015
del os .environ ["CONFIG_TEST_ENV" ]
1031
1016
del os .environ ["CONFIG_TEST_PATH" ]
@@ -1051,7 +1036,6 @@ def test_option_missing_envs_not_required(self):
1051
1036
self .assertIsNone (self .config .option .section1 .value1 ())
1052
1037
self .assertEqual (self .config .option .section1 .value2 (), "/path" )
1053
1038
1054
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
1055
1039
def test_option_missing_envs_required (self ):
1056
1040
with open (self .config_file , "w" ) as config_file :
1057
1041
config_file .write (
@@ -1067,7 +1051,6 @@ def test_option_missing_envs_required(self):
1067
1051
"Missing required environment variable \" UNDEFINED\" " ,
1068
1052
)
1069
1053
1070
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
1071
1054
def test_option_missing_envs_strict_mode (self ):
1072
1055
with open (self .config_file , "w" ) as config_file :
1073
1056
config_file .write (
@@ -1084,7 +1067,6 @@ def test_option_missing_envs_strict_mode(self):
1084
1067
"Missing required environment variable \" UNDEFINED\" " ,
1085
1068
)
1086
1069
1087
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
1088
1070
def test_default_values (self ):
1089
1071
os .environ ["DEFINED" ] = "defined"
1090
1072
self .addCleanup (os .environ .pop , "DEFINED" )
@@ -1108,7 +1090,6 @@ def test_default_values(self):
1108
1090
},
1109
1091
)
1110
1092
1111
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
1112
1093
def test_option_env_variable_interpolation (self ):
1113
1094
self .config .option .from_yaml (self .config_file )
1114
1095
@@ -1131,7 +1112,6 @@ def test_option_env_variable_interpolation(self):
1131
1112
self .assertEqual (self .config .option .section1 .value1 (), "test-value" )
1132
1113
self .assertEqual (self .config .option .section1 .value2 (), "test-path/path" )
1133
1114
1134
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
1135
1115
def test_env_variable_interpolation_custom_loader (self ):
1136
1116
self .config .from_yaml (self .config_file , loader = yaml .UnsafeLoader )
1137
1117
@@ -1145,7 +1125,6 @@ def test_env_variable_interpolation_custom_loader(self):
1145
1125
self .assertEqual (self .config .section1 .value1 (), "test-value" )
1146
1126
self .assertEqual (self .config .section1 .value2 (), "test-path/path" )
1147
1127
1148
- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
1149
1128
def test_option_env_variable_interpolation_custom_loader (self ):
1150
1129
self .config .option .from_yaml (self .config_file , loader = yaml .UnsafeLoader )
1151
1130
0 commit comments