Merge staging-next into staging

2020-12-11 18:15:37 +00:00
parent 4c5d46c1f2 1ed340e389
commit ad994db6cd
42 changed files with 233 additions and 192 deletions
@@ -38,7 +38,7 @@ buildPythonApplication rec {
  checkPhase = ''
    ${lib.optionalString stdenv.isDarwin ''
      # network tests fails on darwin
-      rm tests/test_network.py
+      rm tests/test_network.py tests/checker/test_http*.py tests/checker/test_content_allows_robots.py tests/checker/test_noproxy.py
    ''}
      pytest --ignore=tests/checker/{test_telnet,telnetserver}.py \
        -k 'not TestLoginUrl and not test_timeit2'