Mark linter tests and tests which require network (ros-infrastructure…

…#884) Marking tests appropriately will allow us to be more selective about what tests are run.
cdhabecker · Jun 24, 2022 · 275cdeb · 275cdeb
1 parent 4b52357
commit 275cdeb
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 0 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -2,6 +2,10 @@
 filterwarnings =
     ignore:deprecated.( use rosdistro instead| see REP137 and rosdistro):UserWarning:rosdep2
 junit_suite_name = rosdep
+markers =
+  flake8
+  linter
+  online
 
 [coverage:run]
 source = rosdep2
diff --git a/test/test_flake8.py b/test/test_flake8.py
@@ -18,8 +18,11 @@
 import sys
 
 from flake8.api.legacy import get_style_guide
+import pytest
 
 
+@pytest.mark.flake8
+@pytest.mark.linter
 def test_flake8():
     style_guide = get_style_guide(
         exclude=['conf.py'],

diff --git a/test/test_rosdep_catkin_support.py b/test/test_rosdep_catkin_support.py
@@ -1,8 +1,10 @@
 from rosdep2.catkin_support import get_installer, get_catkin_view, ValidationFailed, resolve_for_os
 
 from rosdep2.platforms.debian import APT_INSTALLER
+import pytest
 
 
+@pytest.mark.online
 def test_workflow():
     try:
         installer = get_installer(APT_INSTALLER)

diff --git a/test/test_rosdep_gbpdistro_support.py b/test/test_rosdep_gbpdistro_support.py
@@ -31,12 +31,15 @@
 except ImportError:
     from urllib2 import urlopen
 
+import pytest
+
 
 def get_test_dir():
     return os.path.abspath(os.path.join(os.path.dirname(__file__),
                                         'sources.list.d'))
 
 
+@pytest.mark.online
 def test_url_constants():
     from rosdep2.gbpdistro_support import FUERTE_GBPDISTRO_URL
     for url_name, url in [
@@ -49,6 +52,7 @@ def test_url_constants():
             assert False, 'URL [%s][%s] failed to download' % (url_name, url)
 
 
+@pytest.mark.online
 def test_get_gbprepo_as_rosdep_data():
     from rosdep2.rosdistrohelper import get_index
     from rosdep2.gbpdistro_support import get_gbprepo_as_rosdep_data
@@ -67,6 +71,7 @@ def test_get_gbprepo_as_rosdep_data():
         pass
 
 
+@pytest.mark.online
 def test_download_gbpdistro_as_rosdep_data():
     from rosdep2.gbpdistro_support import download_gbpdistro_as_rosdep_data
     from rosdep2.gbpdistro_support import FUERTE_GBPDISTRO_URL

diff --git a/test/test_rosdep_rep3.py b/test/test_rosdep_rep3.py
@@ -31,11 +31,14 @@
 except ImportError:
     from urllib2 import urlopen
 
+import pytest
+
 
 def get_test_dir():
     return os.path.abspath(os.path.join(os.path.dirname(__file__), 'sources.list.d'))
 
 
+@pytest.mark.online
 def test_url_constants():
     from rosdep2.rep3 import REP3_TARGETS_URL
     for url_name, url in [('REP3_TARGETS_URL', REP3_TARGETS_URL),
@@ -48,6 +51,7 @@ def test_url_constants():
             assert False, 'URL [%s][%s] failed to download' % (url_name, url)
 
 
+@pytest.mark.online
 def test_download_targets_data():
     from rosdep2.rep3 import download_targets_data, REP3_TARGETS_URL
     from rosdep2 import DownloadFailure

diff --git a/test/test_rosdep_source.py b/test/test_rosdep_source.py
@@ -28,6 +28,7 @@
 # Author Ken Conley/[email protected]
 
 import os
+import pytest
 import yaml
 
 rep122_install_command = """#!/bin/bash
@@ -300,12 +301,14 @@ def test_download_rdmanifest():
         pass
 
 
+@pytest.mark.online
 def test_install_from_file():
     from rosdep2.platforms.source import install_from_file
     f = os.path.join(get_test_dir(), 'noop-not-installed.rdmanifest')
     install_from_file(f)
 
 
+@pytest.mark.online
 def test_install_source():
     from rosdep2.platforms.source import install_source, SourceInstall
     resolved = SourceInstall()

diff --git a/test/test_rosdep_sources_list.py b/test/test_rosdep_sources_list.py
@@ -35,6 +35,7 @@
     from urllib2 import urlopen
     from urllib2 import URLError
 
+import pytest
 import rospkg.distro
 import rosdep2.sources_list
 
@@ -53,6 +54,7 @@ def test_get_sources_cache_dir():
     assert rosdep2.sources_list.get_sources_cache_dir()
 
 
+@pytest.mark.online
 def test_url_constants():
     from rosdep2.sources_list import DEFAULT_SOURCES_LIST_URL
     for url_name, url in [('DEFAULT_SOURCES_LIST_URL', DEFAULT_SOURCES_LIST_URL)]:
@@ -64,6 +66,7 @@ def test_url_constants():
             assert False, 'URL [%s][%s] failed to download' % (url_name, url)
 
 
+@pytest.mark.online
 def test_download_default_sources_list():
     from rosdep2.sources_list import download_default_sources_list
     data = download_default_sources_list()
@@ -193,6 +196,7 @@ def test_write_cache_file():
         assert {'data': 1} == pickle.loads(f.read())
 
 
+@pytest.mark.online
 def test_update_sources_list():
     from rosdep2.sources_list import update_sources_list, InvalidData, compute_filename_hash, PICKLE_CACHE_EXT
     try:
@@ -245,6 +249,7 @@ def error_handler(loc, e):
     assert expected == index, '\n[%s]\nvs\n[%s]' % (expected, index)
 
 
+@pytest.mark.online
 def test_load_cached_sources_list():
     from rosdep2.sources_list import load_cached_sources_list, update_sources_list
     tempdir = tempfile.mkdtemp()
@@ -296,6 +301,7 @@ def test_DataSourceMatcher():
     assert not matcher.matches(data_source)
 
 
+@pytest.mark.online
 def test_download_rosdep_data():
     from rosdep2.sources_list import download_rosdep_data
     from rosdep2 import DownloadFailure
@@ -411,6 +417,7 @@ def test_DataSourceMatcher_create_default():
     assert not matcher.matches(data_source)
 
 
+@pytest.mark.online
 def test_SourcesListLoader_create_default():
     from rosdep2.sources_list import update_sources_list, SourcesListLoader, DataSourceMatcher
     # create temp dir for holding sources cache