@@ -795,7 +795,6 @@ def tearDown(self):
795795 os .unlink (self .config_file_1 )
796796 os .unlink (self .config_file_2 )
797797
798- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
799798 def test (self ):
800799 self .config .from_yaml (self .config_file_1 )
801800
@@ -805,7 +804,6 @@ def test(self):
805804 self .assertEqual (self .config .section2 (), {"value2" : 2 })
806805 self .assertEqual (self .config .section2 .value2 (), 2 )
807806
808- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
809807 def test_merge (self ):
810808 self .config .from_yaml (self .config_file_1 )
811809 self .config .from_yaml (self .config_file_2 )
@@ -833,45 +831,37 @@ def test_merge(self):
833831 self .assertEqual (self .config .section3 (), {"value3" : 3 })
834832 self .assertEqual (self .config .section3 .value3 (), 3 )
835833
836- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
837834 def test_file_does_not_exist (self ):
838835 self .config .from_yaml ("./does_not_exist.yml" )
839836 self .assertEqual (self .config (), {})
840837
841- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
842838 def test_file_does_not_exist_strict_mode (self ):
843839 self .config = providers .Configuration (strict = True )
844840 with self .assertRaises (IOError ):
845841 self .config .from_yaml ("./does_not_exist.yml" )
846842
847- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
848843 def test_option_file_does_not_exist (self ):
849844 self .config .option .from_yaml ("./does_not_exist.yml" )
850845 self .assertIsNone (self .config .option ())
851846
852- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
853847 def test_option_file_does_not_exist_strict_mode (self ):
854848 self .config = providers .Configuration (strict = True )
855849 with self .assertRaises (IOError ):
856850 self .config .option .from_yaml ("./does_not_exist.yml" )
857851
858- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
859852 def test_required_file_does_not_exist (self ):
860853 with self .assertRaises (IOError ):
861854 self .config .from_yaml ("./does_not_exist.yml" , required = True )
862855
863- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
864856 def test_required_option_file_does_not_exist (self ):
865857 with self .assertRaises (IOError ):
866858 self .config .option .from_yaml ("./does_not_exist.yml" , required = True )
867859
868- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
869860 def test_not_required_file_does_not_exist_strict_mode (self ):
870861 self .config = providers .Configuration (strict = True )
871862 self .config .from_yaml ("./does_not_exist.yml" , required = False )
872863 self .assertEqual (self .config (), {})
873864
874- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
875865 def test_not_required_option_file_does_not_exist_strict_mode (self ):
876866 self .config = providers .Configuration (strict = True )
877867 self .config .option .from_yaml ("./does_not_exist.yml" , required = False )
@@ -943,7 +933,6 @@ def tearDown(self):
943933 os .environ .pop ("CONFIG_TEST_PATH" , None )
944934 os .unlink (self .config_file )
945935
946- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
947936 def test_env_variable_interpolation (self ):
948937 self .config .from_yaml (self .config_file )
949938
@@ -966,7 +955,6 @@ def test_env_variable_interpolation(self):
966955 self .assertEqual (self .config .section1 .value1 (), "test-value" )
967956 self .assertEqual (self .config .section1 .value2 (), "test-path/path" )
968957
969- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
970958 def test_missing_envs_not_required (self ):
971959 del os .environ ["CONFIG_TEST_ENV" ]
972960 del os .environ ["CONFIG_TEST_PATH" ]
@@ -992,7 +980,6 @@ def test_missing_envs_not_required(self):
992980 self .assertIsNone (self .config .section1 .value1 ())
993981 self .assertEqual (self .config .section1 .value2 (), "/path" )
994982
995- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
996983 def test_missing_envs_required (self ):
997984 with open (self .config_file , "w" ) as config_file :
998985 config_file .write (
@@ -1008,7 +995,6 @@ def test_missing_envs_required(self):
1008995 "Missing required environment variable \" UNDEFINED\" " ,
1009996 )
1010997
1011- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
1012998 def test_missing_envs_strict_mode (self ):
1013999 with open (self .config_file , "w" ) as config_file :
10141000 config_file .write (
@@ -1025,7 +1011,6 @@ def test_missing_envs_strict_mode(self):
10251011 "Missing required environment variable \" UNDEFINED\" " ,
10261012 )
10271013
1028- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
10291014 def test_option_missing_envs_not_required (self ):
10301015 del os .environ ["CONFIG_TEST_ENV" ]
10311016 del os .environ ["CONFIG_TEST_PATH" ]
@@ -1051,7 +1036,6 @@ def test_option_missing_envs_not_required(self):
10511036 self .assertIsNone (self .config .option .section1 .value1 ())
10521037 self .assertEqual (self .config .option .section1 .value2 (), "/path" )
10531038
1054- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
10551039 def test_option_missing_envs_required (self ):
10561040 with open (self .config_file , "w" ) as config_file :
10571041 config_file .write (
@@ -1067,7 +1051,6 @@ def test_option_missing_envs_required(self):
10671051 "Missing required environment variable \" UNDEFINED\" " ,
10681052 )
10691053
1070- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
10711054 def test_option_missing_envs_strict_mode (self ):
10721055 with open (self .config_file , "w" ) as config_file :
10731056 config_file .write (
@@ -1084,7 +1067,6 @@ def test_option_missing_envs_strict_mode(self):
10841067 "Missing required environment variable \" UNDEFINED\" " ,
10851068 )
10861069
1087- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
10881070 def test_default_values (self ):
10891071 os .environ ["DEFINED" ] = "defined"
10901072 self .addCleanup (os .environ .pop , "DEFINED" )
@@ -1108,7 +1090,6 @@ def test_default_values(self):
11081090 },
11091091 )
11101092
1111- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
11121093 def test_option_env_variable_interpolation (self ):
11131094 self .config .option .from_yaml (self .config_file )
11141095
@@ -1131,7 +1112,6 @@ def test_option_env_variable_interpolation(self):
11311112 self .assertEqual (self .config .option .section1 .value1 (), "test-value" )
11321113 self .assertEqual (self .config .option .section1 .value2 (), "test-path/path" )
11331114
1134- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
11351115 def test_env_variable_interpolation_custom_loader (self ):
11361116 self .config .from_yaml (self .config_file , loader = yaml .UnsafeLoader )
11371117
@@ -1145,7 +1125,6 @@ def test_env_variable_interpolation_custom_loader(self):
11451125 self .assertEqual (self .config .section1 .value1 (), "test-value" )
11461126 self .assertEqual (self .config .section1 .value2 (), "test-path/path" )
11471127
1148- @unittest .skipIf (sys .version_info [:2 ] == (3 , 4 ), "PyYAML does not support Python 3.4" )
11491128 def test_option_env_variable_interpolation_custom_loader (self ):
11501129 self .config .option .from_yaml (self .config_file , loader = yaml .UnsafeLoader )
11511130
0 commit comments