[Numpy-svn] [numpy/numpy] 7810a6: TST: Backport #7116

[GitHub]

  Branch: refs/heads/maintenance/1.11.x
  Home:   https://github.com/numpy/numpy
  Commit: 7810a636fd06513d245c8be8daf304589af1a879
      https://github.com/numpy/numpy/commit/7810a636fd06513d245c8be8daf304589af1a879
  Author: gfyoung <gfyoung17 at gmail.com>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M numpy/tests/test_scripts.py

  Log Message:
  -----------
  TST: Backport #7116


  Commit: 3aebcbb128000ca13fbc1486a9ec8345fa0ae575
      https://github.com/numpy/numpy/commit/3aebcbb128000ca13fbc1486a9ec8345fa0ae575
  Author: gfyoung <gfyoung17 at gmail.com>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M numpy/tests/test_scripts.py

  Log Message:
  -----------
  TST: Backport #7171


  Commit: 409b26730bda0a95e3929154ec66d102c1acd7d7
      https://github.com/numpy/numpy/commit/409b26730bda0a95e3929154ec66d102c1acd7d7
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2016-02-02 (Tue, 02 Feb 2016)

  Changed paths:
    M numpy/tests/test_scripts.py

  Log Message:
  -----------
  Merge pull request #7172 from gfyoung/backport-7116-and-7171

TST: Backport #7116 and #7171


Compare: https://github.com/numpy/numpy/compare/3a029a695cb6...409b26730bda