From d6dfb1a393c6c03f42ed419c085142a69bc7c9e1 Mon Sep 17 00:00:00 2001
From: TomV <tom@viner.tv>
Date: Mon, 23 May 2016 09:48:25 +0100
Subject: [PATCH] issue 1544: norecursedirs build & dist dirs

---
 CHANGELOG.rst              | 7 +++++++
 _pytest/main.py            | 2 +-
 doc/en/customize.rst       | 2 +-
 testing/test_collection.py | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index dfd5c2236ab..3caa943c54d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -41,6 +41,11 @@
 
 *
 
+* Add ``build/`` and ``dist/`` to the default ``--norecursedirs`` list. Thanks
+  `@mikofski`_ for the report and `@tomviner`_ for the PR (`#1544`_).
+
+*
+
 .. _@milliams: https://github.com/milliams
 .. _@novas0x2a: https://github.com/novas0x2a
 .. _@kalekundert: https://github.com/kalekundert
@@ -48,6 +53,7 @@
 .. _@ceridwen: https://github.com/ceridwen
 .. _@palaviv: https://github.com/palaviv
 .. _@omarkohl: https://github.com/omarkohl
+.. _@mikofski: https://github.com/mikofski
 
 .. _#1428: https://github.com/pytest-dev/pytest/pull/1428
 .. _#1444: https://github.com/pytest-dev/pytest/pull/1444
@@ -58,6 +64,7 @@
 .. _#1474: https://github.com/pytest-dev/pytest/pull/1474
 .. _#1502: https://github.com/pytest-dev/pytest/pull/1502
 .. _#372: https://github.com/pytest-dev/pytest/issues/372
+.. _#1544: https://github.com/pytest-dev/pytest/issues/1544
 
 2.9.2.dev1
 ==========
diff --git a/_pytest/main.py b/_pytest/main.py
index 8654d7af627..47b6cb694c9 100644
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -29,7 +29,7 @@
 
 def pytest_addoption(parser):
     parser.addini("norecursedirs", "directory patterns to avoid for recursion",
-        type="args", default=['.*', 'CVS', '_darcs', '{arch}', '*.egg'])
+        type="args", default=['.*', 'build', 'dist', 'CVS', '_darcs', '{arch}', '*.egg'])
     parser.addini("testpaths", "directories to search for tests when no files or directories are given in the command line.",
         type="args", default=[])
     #parser.addini("dirpatterns",
diff --git a/doc/en/customize.rst b/doc/en/customize.rst
index 34e319c246a..69cf7c24110 100644
--- a/doc/en/customize.rst
+++ b/doc/en/customize.rst
@@ -144,7 +144,7 @@ Builtin configuration file options
         [seq]   matches any character in seq
         [!seq]  matches any char not in seq
 
-   Default patterns are ``'.*', 'CVS', '_darcs', '{arch}', '*.egg'``.
+   Default patterns are ``'.*', 'build', 'dist', 'CVS', '_darcs', '{arch}', '*.egg'``.
    Setting a ``norecursedirs`` replaces the default.  Here is an example of
    how to avoid certain directories:
 
diff --git a/testing/test_collection.py b/testing/test_collection.py
index 749c5b7ce45..24368c73d1a 100644
--- a/testing/test_collection.py
+++ b/testing/test_collection.py
@@ -88,6 +88,8 @@ def pytest_collect_file(path, parent):
 class TestCollectFS:
     def test_ignored_certain_directories(self, testdir):
         tmpdir = testdir.tmpdir
+        tmpdir.ensure("build", 'test_notfound.py')
+        tmpdir.ensure("dist", 'test_notfound.py')
         tmpdir.ensure("_darcs", 'test_notfound.py')
         tmpdir.ensure("CVS", 'test_notfound.py')
         tmpdir.ensure("{arch}", 'test_notfound.py')