tests: Move data to new directory

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/tests/__init__.py b/patchwork/tests/__init__.py
index b5be2dbc673c4ba438693eacad5db616a1728b1d..ec1a1f4d27a99460998492182222f403f68585bd 100644 (file)
--- a/patchwork/tests/__init__.py
+++ b/patchwork/tests/__init__.py
@@ -6,10 +6,10 @@
 import os
 import warnings
 
-TEST_MAIL_DIR = os.path.join(os.path.dirname(__file__), 'mail')
-TEST_PATCH_DIR = os.path.join(os.path.dirname(__file__), 'patches')
-TEST_FUZZ_DIR = os.path.join(os.path.dirname(__file__), 'fuzztests')
-TEST_SERIES_DIR = os.path.join(os.path.dirname(__file__), 'series')
+TEST_MAIL_DIR = os.path.join(os.path.dirname(__file__), 'data', 'mail')
+TEST_PATCH_DIR = os.path.join(os.path.dirname(__file__), 'data', 'patches')
+TEST_FUZZ_DIR = os.path.join(os.path.dirname(__file__), 'data', 'fuzz')
+TEST_SERIES_DIR = os.path.join(os.path.dirname(__file__), 'data', 'series')
 
 # configure warnings
 

diff --git a/patchwork/tests/fuzztests/base64err.mbox b/patchwork/tests/data/fuzz/base64err.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/base64err.mbox
rename to patchwork/tests/data/fuzz/base64err.mbox

diff --git a/patchwork/tests/fuzztests/charset.mbox b/patchwork/tests/data/fuzz/charset.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/charset.mbox
rename to patchwork/tests/data/fuzz/charset.mbox

diff --git a/patchwork/tests/fuzztests/codec-null.mbox b/patchwork/tests/data/fuzz/codec-null.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/codec-null.mbox
rename to patchwork/tests/data/fuzz/codec-null.mbox

diff --git a/patchwork/tests/fuzztests/date-oserror.mbox b/patchwork/tests/data/fuzz/date-oserror.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/date-oserror.mbox
rename to patchwork/tests/data/fuzz/date-oserror.mbox

diff --git a/patchwork/tests/fuzztests/date-too-long.mbox b/patchwork/tests/data/fuzz/date-too-long.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/date-too-long.mbox
rename to patchwork/tests/data/fuzz/date-too-long.mbox

diff --git a/patchwork/tests/fuzztests/date.mbox b/patchwork/tests/data/fuzz/date.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/date.mbox
rename to patchwork/tests/data/fuzz/date.mbox

diff --git a/patchwork/tests/fuzztests/dateheader.mbox b/patchwork/tests/data/fuzz/dateheader.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/dateheader.mbox
rename to patchwork/tests/data/fuzz/dateheader.mbox

diff --git a/patchwork/tests/fuzztests/email-len.mbox b/patchwork/tests/data/fuzz/email-len.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/email-len.mbox
rename to patchwork/tests/data/fuzz/email-len.mbox

diff --git a/patchwork/tests/fuzztests/msgid-len.mbox b/patchwork/tests/data/fuzz/msgid-len.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/msgid-len.mbox
rename to patchwork/tests/data/fuzz/msgid-len.mbox

diff --git a/patchwork/tests/fuzztests/msgid-len2.mbox b/patchwork/tests/data/fuzz/msgid-len2.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/msgid-len2.mbox
rename to patchwork/tests/data/fuzz/msgid-len2.mbox

diff --git a/patchwork/tests/fuzztests/msgidheader.mbox b/patchwork/tests/data/fuzz/msgidheader.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/msgidheader.mbox
rename to patchwork/tests/data/fuzz/msgidheader.mbox

diff --git a/patchwork/tests/fuzztests/name-len.mbox b/patchwork/tests/data/fuzz/name-len.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/name-len.mbox
rename to patchwork/tests/data/fuzz/name-len.mbox

diff --git a/patchwork/tests/fuzztests/refshdr.mbox b/patchwork/tests/data/fuzz/refshdr.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/refshdr.mbox
rename to patchwork/tests/data/fuzz/refshdr.mbox

diff --git a/patchwork/tests/fuzztests/unknown-encoding.mbox b/patchwork/tests/data/fuzz/unknown-encoding.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/unknown-encoding.mbox
rename to patchwork/tests/data/fuzz/unknown-encoding.mbox

diff --git a/patchwork/tests/fuzztests/value2.mbox b/patchwork/tests/data/fuzz/value2.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/value2.mbox
rename to patchwork/tests/data/fuzz/value2.mbox

diff --git a/patchwork/tests/fuzztests/x-face.mbox b/patchwork/tests/data/fuzz/x-face.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/x-face.mbox
rename to patchwork/tests/data/fuzz/x-face.mbox

diff --git a/patchwork/tests/fuzztests/year-out-of-range.mbox b/patchwork/tests/data/fuzz/year-out-of-range.mbox
similarity index 100%
rename from patchwork/tests/fuzztests/year-out-of-range.mbox
rename to patchwork/tests/data/fuzz/year-out-of-range.mbox

diff --git a/patchwork/tests/mail/0001-git-pull-request.mbox b/patchwork/tests/data/mail/0001-git-pull-request.mbox
similarity index 100%
rename from patchwork/tests/mail/0001-git-pull-request.mbox
rename to patchwork/tests/data/mail/0001-git-pull-request.mbox

diff --git a/patchwork/tests/mail/0002-git-pull-request-wrapped.mbox b/patchwork/tests/data/mail/0002-git-pull-request-wrapped.mbox
similarity index 100%
rename from patchwork/tests/mail/0002-git-pull-request-wrapped.mbox
rename to patchwork/tests/data/mail/0002-git-pull-request-wrapped.mbox

diff --git a/patchwork/tests/mail/0003-git-pull-request-with-diff.mbox b/patchwork/tests/data/mail/0003-git-pull-request-with-diff.mbox
similarity index 100%
rename from patchwork/tests/mail/0003-git-pull-request-with-diff.mbox
rename to patchwork/tests/data/mail/0003-git-pull-request-with-diff.mbox

diff --git a/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox b/patchwork/tests/data/mail/0004-git-pull-request-git+ssh.mbox
similarity index 100%
rename from patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox
rename to patchwork/tests/data/mail/0004-git-pull-request-git+ssh.mbox

diff --git a/patchwork/tests/mail/0005-git-pull-request-ssh.mbox b/patchwork/tests/data/mail/0005-git-pull-request-ssh.mbox
similarity index 100%
rename from patchwork/tests/mail/0005-git-pull-request-ssh.mbox
rename to patchwork/tests/data/mail/0005-git-pull-request-ssh.mbox

diff --git a/patchwork/tests/mail/0006-git-pull-request-http.mbox b/patchwork/tests/data/mail/0006-git-pull-request-http.mbox
similarity index 100%
rename from patchwork/tests/mail/0006-git-pull-request-http.mbox
rename to patchwork/tests/data/mail/0006-git-pull-request-http.mbox

diff --git a/patchwork/tests/mail/0007-cvs-format-diff.mbox b/patchwork/tests/data/mail/0007-cvs-format-diff.mbox
similarity index 100%
rename from patchwork/tests/mail/0007-cvs-format-diff.mbox
rename to patchwork/tests/data/mail/0007-cvs-format-diff.mbox

diff --git a/patchwork/tests/mail/0008-git-rename.mbox b/patchwork/tests/data/mail/0008-git-rename.mbox
similarity index 100%
rename from patchwork/tests/mail/0008-git-rename.mbox
rename to patchwork/tests/data/mail/0008-git-rename.mbox

diff --git a/patchwork/tests/mail/0009-git-rename-with-diff.mbox b/patchwork/tests/data/mail/0009-git-rename-with-diff.mbox
similarity index 100%
rename from patchwork/tests/mail/0009-git-rename-with-diff.mbox
rename to patchwork/tests/data/mail/0009-git-rename-with-diff.mbox

diff --git a/patchwork/tests/mail/0010-invalid-charset.mbox b/patchwork/tests/data/mail/0010-invalid-charset.mbox
similarity index 100%
rename from patchwork/tests/mail/0010-invalid-charset.mbox
rename to patchwork/tests/data/mail/0010-invalid-charset.mbox

diff --git a/patchwork/tests/mail/0011-no-newline-at-end-of-file.mbox b/patchwork/tests/data/mail/0011-no-newline-at-end-of-file.mbox
similarity index 100%
rename from patchwork/tests/mail/0011-no-newline-at-end-of-file.mbox
rename to patchwork/tests/data/mail/0011-no-newline-at-end-of-file.mbox

diff --git a/patchwork/tests/mail/0012-invalid-header-char.mbox b/patchwork/tests/data/mail/0012-invalid-header-char.mbox
similarity index 100%
rename from patchwork/tests/mail/0012-invalid-header-char.mbox
rename to patchwork/tests/data/mail/0012-invalid-header-char.mbox

diff --git a/patchwork/tests/mail/0013-with-utf8-body.mbox b/patchwork/tests/data/mail/0013-with-utf8-body.mbox
similarity index 100%
rename from patchwork/tests/mail/0013-with-utf8-body.mbox
rename to patchwork/tests/data/mail/0013-with-utf8-body.mbox

diff --git a/patchwork/tests/mail/0014-with-unencoded-utf8-headers.mbox b/patchwork/tests/data/mail/0014-with-unencoded-utf8-headers.mbox
similarity index 100%
rename from patchwork/tests/mail/0014-with-unencoded-utf8-headers.mbox
rename to patchwork/tests/data/mail/0014-with-unencoded-utf8-headers.mbox

diff --git a/patchwork/tests/mail/0015-with-invalid-utf8-headers.mbox b/patchwork/tests/data/mail/0015-with-invalid-utf8-headers.mbox
similarity index 100%
rename from patchwork/tests/mail/0015-with-invalid-utf8-headers.mbox
rename to patchwork/tests/data/mail/0015-with-invalid-utf8-headers.mbox

diff --git a/patchwork/tests/mail/0016-no-subject.mbox b/patchwork/tests/data/mail/0016-no-subject.mbox
similarity index 100%
rename from patchwork/tests/mail/0016-no-subject.mbox
rename to patchwork/tests/data/mail/0016-no-subject.mbox

diff --git a/patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox b/patchwork/tests/data/mail/0017-git-pull-request-git-2-14-3.mbox
similarity index 100%
rename from patchwork/tests/mail/0017-git-pull-request-git-2-14-3.mbox
rename to patchwork/tests/data/mail/0017-git-pull-request-git-2-14-3.mbox

diff --git a/patchwork/tests/mail/0019-multipart-patch.mbox b/patchwork/tests/data/mail/0019-multipart-patch.mbox
similarity index 100%
rename from patchwork/tests/mail/0019-multipart-patch.mbox
rename to patchwork/tests/data/mail/0019-multipart-patch.mbox

diff --git a/patchwork/tests/mail/0020-multipart-comment.mbox b/patchwork/tests/data/mail/0020-multipart-comment.mbox
similarity index 100%
rename from patchwork/tests/mail/0020-multipart-comment.mbox
rename to patchwork/tests/data/mail/0020-multipart-comment.mbox

diff --git a/patchwork/tests/mail/0021-git-empty-new-file.mbox b/patchwork/tests/data/mail/0021-git-empty-new-file.mbox
similarity index 100%
rename from patchwork/tests/mail/0021-git-empty-new-file.mbox
rename to patchwork/tests/data/mail/0021-git-empty-new-file.mbox

diff --git a/patchwork/tests/mail/0022-git-mode-change.mbox b/patchwork/tests/data/mail/0022-git-mode-change.mbox
similarity index 100%
rename from patchwork/tests/mail/0022-git-mode-change.mbox
rename to patchwork/tests/data/mail/0022-git-mode-change.mbox

diff --git a/patchwork/tests/mail/0023-git-pull-request-newline-in-url.mbox b/patchwork/tests/data/mail/0023-git-pull-request-newline-in-url.mbox
similarity index 100%
rename from patchwork/tests/mail/0023-git-pull-request-newline-in-url.mbox
rename to patchwork/tests/data/mail/0023-git-pull-request-newline-in-url.mbox

diff --git a/patchwork/tests/mail/0024-git-pull-request-trailing-space.mbox b/patchwork/tests/data/mail/0024-git-pull-request-trailing-space.mbox
similarity index 100%
rename from patchwork/tests/mail/0024-git-pull-request-trailing-space.mbox
rename to patchwork/tests/data/mail/0024-git-pull-request-trailing-space.mbox

diff --git a/patchwork/tests/mail/0025-git-add-binary-file.mbox b/patchwork/tests/data/mail/0025-git-add-binary-file.mbox
similarity index 100%
rename from patchwork/tests/mail/0025-git-add-binary-file.mbox
rename to patchwork/tests/data/mail/0025-git-add-binary-file.mbox

diff --git a/patchwork/tests/mail/0026-git-add-mixed-binary-text-files.mbox b/patchwork/tests/data/mail/0026-git-add-mixed-binary-text-files.mbox
similarity index 100%
rename from patchwork/tests/mail/0026-git-add-mixed-binary-text-files.mbox
rename to patchwork/tests/data/mail/0026-git-add-mixed-binary-text-files.mbox

diff --git a/patchwork/tests/mail/0027-git-modify-binary-file.mbox b/patchwork/tests/data/mail/0027-git-modify-binary-file.mbox
similarity index 100%
rename from patchwork/tests/mail/0027-git-modify-binary-file.mbox
rename to patchwork/tests/data/mail/0027-git-modify-binary-file.mbox

diff --git a/patchwork/tests/patches/0001-add-line.patch b/patchwork/tests/data/patches/0001-add-line.patch
similarity index 100%
rename from patchwork/tests/patches/0001-add-line.patch
rename to patchwork/tests/data/patches/0001-add-line.patch

diff --git a/patchwork/tests/patches/0002-utf-8.patch b/patchwork/tests/data/patches/0002-utf-8.patch
similarity index 100%
rename from patchwork/tests/patches/0002-utf-8.patch
rename to patchwork/tests/data/patches/0002-utf-8.patch

diff --git a/patchwork/tests/series/README.md b/patchwork/tests/data/series/README.md
similarity index 100%
rename from patchwork/tests/series/README.md
rename to patchwork/tests/data/series/README.md

diff --git a/patchwork/tests/series/base-cover-letter.mbox b/patchwork/tests/data/series/base-cover-letter.mbox
similarity index 100%
rename from patchwork/tests/series/base-cover-letter.mbox
rename to patchwork/tests/data/series/base-cover-letter.mbox

diff --git a/patchwork/tests/series/base-deep-threaded.mbox b/patchwork/tests/data/series/base-deep-threaded.mbox
similarity index 100%
rename from patchwork/tests/series/base-deep-threaded.mbox
rename to patchwork/tests/data/series/base-deep-threaded.mbox

diff --git a/patchwork/tests/series/base-different-versions.mbox b/patchwork/tests/data/series/base-different-versions.mbox
similarity index 100%
rename from patchwork/tests/series/base-different-versions.mbox
rename to patchwork/tests/data/series/base-different-versions.mbox

diff --git a/patchwork/tests/series/base-extra-patches.mbox b/patchwork/tests/data/series/base-extra-patches.mbox
similarity index 100%
rename from patchwork/tests/series/base-extra-patches.mbox
rename to patchwork/tests/data/series/base-extra-patches.mbox

diff --git a/patchwork/tests/series/base-incomplete.mbox b/patchwork/tests/data/series/base-incomplete.mbox
similarity index 100%
rename from patchwork/tests/series/base-incomplete.mbox
rename to patchwork/tests/data/series/base-incomplete.mbox

diff --git a/patchwork/tests/series/base-no-cover-letter.mbox b/patchwork/tests/data/series/base-no-cover-letter.mbox
similarity index 100%
rename from patchwork/tests/series/base-no-cover-letter.mbox
rename to patchwork/tests/data/series/base-no-cover-letter.mbox

diff --git a/patchwork/tests/series/base-no-references-no-cover.mbox b/patchwork/tests/data/series/base-no-references-no-cover.mbox
similarity index 100%
rename from patchwork/tests/series/base-no-references-no-cover.mbox
rename to patchwork/tests/data/series/base-no-references-no-cover.mbox

diff --git a/patchwork/tests/series/base-no-references.mbox b/patchwork/tests/data/series/base-no-references.mbox
similarity index 100%
rename from patchwork/tests/series/base-no-references.mbox
rename to patchwork/tests/data/series/base-no-references.mbox

diff --git a/patchwork/tests/series/base-out-of-order.mbox b/patchwork/tests/data/series/base-out-of-order.mbox
similarity index 100%
rename from patchwork/tests/series/base-out-of-order.mbox
rename to patchwork/tests/data/series/base-out-of-order.mbox

diff --git a/patchwork/tests/series/base-single-patch.mbox b/patchwork/tests/data/series/base-single-patch.mbox
similarity index 100%
rename from patchwork/tests/series/base-single-patch.mbox
rename to patchwork/tests/data/series/base-single-patch.mbox

diff --git a/patchwork/tests/series/bugs-mixed-versions.mbox b/patchwork/tests/data/series/bugs-mixed-versions.mbox
similarity index 100%
rename from patchwork/tests/series/bugs-mixed-versions.mbox
rename to patchwork/tests/data/series/bugs-mixed-versions.mbox

diff --git a/patchwork/tests/series/bugs-multiple-content-types.mbox b/patchwork/tests/data/series/bugs-multiple-content-types.mbox
similarity index 100%
rename from patchwork/tests/series/bugs-multiple-content-types.mbox
rename to patchwork/tests/data/series/bugs-multiple-content-types.mbox

diff --git a/patchwork/tests/series/bugs-multiple-references.mbox b/patchwork/tests/data/series/bugs-multiple-references.mbox
similarity index 100%
rename from patchwork/tests/series/bugs-multiple-references.mbox
rename to patchwork/tests/data/series/bugs-multiple-references.mbox

diff --git a/patchwork/tests/series/bugs-nocover-noversion.mbox b/patchwork/tests/data/series/bugs-nocover-noversion.mbox
similarity index 100%
rename from patchwork/tests/series/bugs-nocover-noversion.mbox
rename to patchwork/tests/data/series/bugs-nocover-noversion.mbox

diff --git a/patchwork/tests/series/bugs-nocover.mbox b/patchwork/tests/data/series/bugs-nocover.mbox
similarity index 100%
rename from patchwork/tests/series/bugs-nocover.mbox
rename to patchwork/tests/data/series/bugs-nocover.mbox

diff --git a/patchwork/tests/series/bugs-spamming.mbox b/patchwork/tests/data/series/bugs-spamming.mbox
similarity index 100%
rename from patchwork/tests/series/bugs-spamming.mbox
rename to patchwork/tests/data/series/bugs-spamming.mbox

diff --git a/patchwork/tests/series/bugs-unnumbered.mbox b/patchwork/tests/data/series/bugs-unnumbered.mbox
similarity index 100%
rename from patchwork/tests/series/bugs-unnumbered.mbox
rename to patchwork/tests/data/series/bugs-unnumbered.mbox

diff --git a/patchwork/tests/series/dependency-base-patch.mbox b/patchwork/tests/data/series/dependency-base-patch.mbox
similarity index 100%
rename from patchwork/tests/series/dependency-base-patch.mbox
rename to patchwork/tests/data/series/dependency-base-patch.mbox

diff --git a/patchwork/tests/series/dependency-multi-2.mbox.template b/patchwork/tests/data/series/dependency-multi-2.mbox.template
similarity index 100%
rename from patchwork/tests/series/dependency-multi-2.mbox.template
rename to patchwork/tests/data/series/dependency-multi-2.mbox.template

diff --git a/patchwork/tests/series/dependency-multi.mbox.template b/patchwork/tests/data/series/dependency-multi.mbox.template
similarity index 100%
rename from patchwork/tests/series/dependency-multi.mbox.template
rename to patchwork/tests/data/series/dependency-multi.mbox.template

diff --git a/patchwork/tests/series/dependency-one-cover.mbox.template b/patchwork/tests/data/series/dependency-one-cover.mbox.template
similarity index 100%
rename from patchwork/tests/series/dependency-one-cover.mbox.template
rename to patchwork/tests/data/series/dependency-one-cover.mbox.template

diff --git a/patchwork/tests/series/dependency-one-first-patch.mbox.template b/patchwork/tests/data/series/dependency-one-first-patch.mbox.template
similarity index 100%
rename from patchwork/tests/series/dependency-one-first-patch.mbox.template
rename to patchwork/tests/data/series/dependency-one-first-patch.mbox.template

diff --git a/patchwork/tests/series/mercurial-cover-letter.mbox b/patchwork/tests/data/series/mercurial-cover-letter.mbox
similarity index 100%
rename from patchwork/tests/series/mercurial-cover-letter.mbox
rename to patchwork/tests/data/series/mercurial-cover-letter.mbox

diff --git a/patchwork/tests/series/mercurial-no-cover-letter.mbox b/patchwork/tests/data/series/mercurial-no-cover-letter.mbox
similarity index 100%
rename from patchwork/tests/series/mercurial-no-cover-letter.mbox
rename to patchwork/tests/data/series/mercurial-no-cover-letter.mbox

diff --git a/patchwork/tests/series/revision-basic.mbox b/patchwork/tests/data/series/revision-basic.mbox
similarity index 100%
rename from patchwork/tests/series/revision-basic.mbox
rename to patchwork/tests/data/series/revision-basic.mbox

diff --git a/patchwork/tests/series/revision-no-cover-letter.mbox b/patchwork/tests/data/series/revision-no-cover-letter.mbox
similarity index 100%
rename from patchwork/tests/series/revision-no-cover-letter.mbox
rename to patchwork/tests/data/series/revision-no-cover-letter.mbox

diff --git a/patchwork/tests/series/revision-out-of-order.mbox b/patchwork/tests/data/series/revision-out-of-order.mbox
similarity index 100%
rename from patchwork/tests/series/revision-out-of-order.mbox
rename to patchwork/tests/data/series/revision-out-of-order.mbox

diff --git a/patchwork/tests/series/revision-threaded-to-cover.mbox b/patchwork/tests/data/series/revision-threaded-to-cover.mbox
similarity index 100%
rename from patchwork/tests/series/revision-threaded-to-cover.mbox
rename to patchwork/tests/data/series/revision-threaded-to-cover.mbox

diff --git a/patchwork/tests/series/revision-threaded-to-patch.mbox b/patchwork/tests/data/series/revision-threaded-to-patch.mbox
similarity index 100%
rename from patchwork/tests/series/revision-threaded-to-patch.mbox
rename to patchwork/tests/data/series/revision-threaded-to-patch.mbox

diff --git a/patchwork/tests/series/revision-threaded-to-single-patch.mbox b/patchwork/tests/data/series/revision-threaded-to-single-patch.mbox
similarity index 100%
rename from patchwork/tests/series/revision-threaded-to-single-patch.mbox
rename to patchwork/tests/data/series/revision-threaded-to-single-patch.mbox

diff --git a/patchwork/tests/series/revision-unlabeled-noreferences.mbox b/patchwork/tests/data/series/revision-unlabeled-noreferences.mbox
similarity index 100%
rename from patchwork/tests/series/revision-unlabeled-noreferences.mbox
rename to patchwork/tests/data/series/revision-unlabeled-noreferences.mbox

diff --git a/patchwork/tests/series/revision-unlabeled.mbox b/patchwork/tests/data/series/revision-unlabeled.mbox
similarity index 100%
rename from patchwork/tests/series/revision-unlabeled.mbox
rename to patchwork/tests/data/series/revision-unlabeled.mbox