Commit dea0a881 authored by Jochen Sprickerhof's avatar Jochen Sprickerhof

Rebase patch

parent ebf51245
......@@ -77,7 +77,7 @@ index 73fe5b9..72a9c19 100644
resolved = SourceInstall()
resolved.tarball = 'https://github.com/ros-infrastructure/rosdep/raw/master/test/source/foo.tar.gz'
diff --git a/test/test_rosdep_sources_list.py b/test/test_rosdep_sources_list.py
index 175d409..c53c516 100644
index e1d2a68..b440256 100644
--- a/test/test_rosdep_sources_list.py
+++ b/test/test_rosdep_sources_list.py
@@ -54,6 +54,7 @@ def test_get_sources_cache_dir():
......
......@@ -7,14 +7,14 @@ Subject: Disable flake8 test
1 file changed, 1 insertion(+)
diff --git a/test/test_flake8.py b/test/test_flake8.py
index 1cac66d..8bd6b20 100644
index 440ca38..97a7311 100644
--- a/test/test_flake8.py
+++ b/test/test_flake8.py
@@ -25,6 +25,7 @@ else:
@@ -21,6 +21,7 @@ from flake8.api.legacy import get_style_guide
def test_flake8():
+ return # disabled because of flake8 errors in upstream code
if get_style_guide is None:
# skip test on Python 2.6 and older
return
style_guide = get_style_guide(
exclude=['conf.py'],
ignore=[
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment