TST: Remove disabled marks

Author: TomAugspurger

pandas/conftest.py

@@ -8,8 +8,6 @@ def pytest_addoption(parser):
                      help="run network tests")
     parser.addoption("--only-slow", action="store_true",
                      help="run only slow tests")
-    parser.addoption("--run-disabled", action="store_false",
-                     help="run disabled tests")
 
 
 def pytest_runtest_setup(item):
@@ -21,6 +19,3 @@ def pytest_runtest_setup(item):
 
     if 'skip' in item.keywords and item.config.getoption("--skip-network"):
         pytest.skip("skipping due to --skip-network")
-
-    if 'disabled' in item.keywords and item.config.getoption("--run-disabled"):
-        pytest.skip("need --run-disabled option to run")

pandas/io/tests/parser/test_network.py

@@ -24,7 +24,7 @@ class TestCompressedUrl(object):
         'xz': '.xz',
     }
 
-    def setUp(self):
+    def setup(self):
         path = os.path.join(tm.get_data_path(), 'salaries.csv')
         self.local_table = read_table(path)
         self.base_url = ('https://github.com/pandas-dev/pandas/raw/master/'

pandas/util/testing.py

@@ -2550,7 +2550,6 @@ def assert_produces_warning(expected_warning=Warning, filter_level="always",
                                     % extra_warnings)
 
 
-disabled = pytest.mark.disabled
 slow = pytest.mark.slow