From b8dd25ff2cebdb4385effa9343698f0745a6f553 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Sun, 9 Jul 2017 16:01:45 -0600 Subject: [PATCH] Move tests from `ffmpeg/tests` to `tests` --- .gitignore | 2 +- README.md | 2 +- pytest.ini | 2 +- {ffmpeg/tests => tests}/__init__.py | 0 {ffmpeg/tests => tests}/sample_data/in1.mp4 | Bin {ffmpeg/tests => tests}/sample_data/overlay.png | Bin {ffmpeg/tests => tests}/test_ffmpeg.py | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename {ffmpeg/tests => tests}/__init__.py (100%) rename {ffmpeg/tests => tests}/sample_data/in1.mp4 (100%) rename {ffmpeg/tests => tests}/sample_data/overlay.png (100%) rename {ffmpeg/tests => tests}/test_ffmpeg.py (100%) diff --git a/.gitignore b/.gitignore index 3179ebc..2b050b9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ .eggs .tox/ dist/ -ffmpeg/tests/sample_data/out*.mp4 +tests/sample_data/out*.mp4 ffmpeg_python.egg-info/ venv* diff --git a/README.md b/README.md index d65b8c3..836e2b1 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ Pull requests are welcome as well. - [API Reference](https://kkroening.github.io/ffmpeg-python/) - [Filters](https://github.com/kkroening/ffmpeg-python/blob/master/ffmpeg/_filters.py) -- [Tests](https://github.com/kkroening/ffmpeg-python/blob/master/ffmpeg/tests/test_ffmpeg.py) +- [Tests](https://github.com/kkroening/ffmpeg-python/blob/master/tests/test_ffmpeg.py) - [FFmpeg Homepage](https://ffmpeg.org/) - [FFmpeg Documentation](https://ffmpeg.org/ffmpeg.html) - [FFmpeg Filters Documentation](https://ffmpeg.org/ffmpeg-filters.html) diff --git a/pytest.ini b/pytest.ini index 01ab5ea..5ee6477 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,2 @@ [pytest] -testpaths = ffmpeg/tests +testpaths = tests diff --git a/ffmpeg/tests/__init__.py b/tests/__init__.py similarity index 100% rename from ffmpeg/tests/__init__.py rename to tests/__init__.py diff --git a/ffmpeg/tests/sample_data/in1.mp4 b/tests/sample_data/in1.mp4 similarity index 100% rename from ffmpeg/tests/sample_data/in1.mp4 rename to tests/sample_data/in1.mp4 diff --git a/ffmpeg/tests/sample_data/overlay.png b/tests/sample_data/overlay.png similarity index 100% rename from ffmpeg/tests/sample_data/overlay.png rename to tests/sample_data/overlay.png diff --git a/ffmpeg/tests/test_ffmpeg.py b/tests/test_ffmpeg.py similarity index 100% rename from ffmpeg/tests/test_ffmpeg.py rename to tests/test_ffmpeg.py