From 3cfe0a19a628456ea3eac010998c5f64bd8808f6 Mon Sep 17 00:00:00 2001 From: Lucas Meneghel Rodrigues Date: Mon, 28 Jul 2014 16:46:56 -0300 Subject: [PATCH] tests: Flatten tests directory We want avocado tests to not require specific directories, the user should be able to arrange them in the dir structure they see fit. Also, if a test requires data, we suppose their data dir is located in the same directory as the source file, with the name: [modulename].data Re arrange the test dir to reflect this new structure. Signed-off-by: Lucas Meneghel Rodrigues --- tests/{doublefail => }/doublefail.py | 0 .../data => doublefree.data}/doublefree.c | 0 tests/{doublefree => }/doublefree.py | 0 tests/{errortest => }/errortest.py | 0 tests/{failtest => }/failtest.py | 0 .../data => fiotest.data}/fio-2.1.7.tar.bz2 | Bin tests/{fiotest/data => fiotest.data}/fio-mixed.job | 0 tests/{fiotest => }/fiotest.py | 0 tests/{gendata => }/gendata.py | 0 tests/{linuxbuild/data => linuxbuild.data}/config | 0 tests/{linuxbuild => }/linuxbuild.py | 0 .../multiplextest.mplx | 0 tests/{multiplextest => }/multiplextest.py | 0 tests/{skiptest => }/skiptest.py | 0 tests/{sleeptenmin => }/sleeptenmin.py | 0 tests/{sleeptest => sleeptest.data}/sleeptest.mplx | 0 tests/{sleeptest => }/sleeptest.py | 0 tests/{synctest => synctest.data}/synctest.mplx | 0 .../data => synctest.data}/synctest.tar.bz2 | Bin tests/{synctest => }/synctest.py | 0 tests/{timeouttest => }/timeouttest.py | 0 .../data => trinity.data}/trinity-1.4.tar.bz2 | Bin tests/{trinity => }/trinity.py | 0 tests/{warntest => }/warntest.py | 0 .../{whiteboard => whiteboard.data}/whiteboard.mplx | 0 tests/{whiteboard => }/whiteboard.py | 0 26 files changed, 0 insertions(+), 0 deletions(-) rename tests/{doublefail => }/doublefail.py (100%) rename tests/{doublefree/data => doublefree.data}/doublefree.c (100%) rename tests/{doublefree => }/doublefree.py (100%) rename tests/{errortest => }/errortest.py (100%) rename tests/{failtest => }/failtest.py (100%) rename tests/{fiotest/data => fiotest.data}/fio-2.1.7.tar.bz2 (100%) rename tests/{fiotest/data => fiotest.data}/fio-mixed.job (100%) rename tests/{fiotest => }/fiotest.py (100%) rename tests/{gendata => }/gendata.py (100%) rename tests/{linuxbuild/data => linuxbuild.data}/config (100%) rename tests/{linuxbuild => }/linuxbuild.py (100%) rename tests/{multiplextest => multiplextest.data}/multiplextest.mplx (100%) rename tests/{multiplextest => }/multiplextest.py (100%) rename tests/{skiptest => }/skiptest.py (100%) rename tests/{sleeptenmin => }/sleeptenmin.py (100%) rename tests/{sleeptest => sleeptest.data}/sleeptest.mplx (100%) rename tests/{sleeptest => }/sleeptest.py (100%) rename tests/{synctest => synctest.data}/synctest.mplx (100%) rename tests/{synctest/data => synctest.data}/synctest.tar.bz2 (100%) rename tests/{synctest => }/synctest.py (100%) rename tests/{timeouttest => }/timeouttest.py (100%) rename tests/{trinity/data => trinity.data}/trinity-1.4.tar.bz2 (100%) rename tests/{trinity => }/trinity.py (100%) rename tests/{warntest => }/warntest.py (100%) rename tests/{whiteboard => whiteboard.data}/whiteboard.mplx (100%) rename tests/{whiteboard => }/whiteboard.py (100%) diff --git a/tests/doublefail/doublefail.py b/tests/doublefail.py similarity index 100% rename from tests/doublefail/doublefail.py rename to tests/doublefail.py diff --git a/tests/doublefree/data/doublefree.c b/tests/doublefree.data/doublefree.c similarity index 100% rename from tests/doublefree/data/doublefree.c rename to tests/doublefree.data/doublefree.c diff --git a/tests/doublefree/doublefree.py b/tests/doublefree.py similarity index 100% rename from tests/doublefree/doublefree.py rename to tests/doublefree.py diff --git a/tests/errortest/errortest.py b/tests/errortest.py similarity index 100% rename from tests/errortest/errortest.py rename to tests/errortest.py diff --git a/tests/failtest/failtest.py b/tests/failtest.py similarity index 100% rename from tests/failtest/failtest.py rename to tests/failtest.py diff --git a/tests/fiotest/data/fio-2.1.7.tar.bz2 b/tests/fiotest.data/fio-2.1.7.tar.bz2 similarity index 100% rename from tests/fiotest/data/fio-2.1.7.tar.bz2 rename to tests/fiotest.data/fio-2.1.7.tar.bz2 diff --git a/tests/fiotest/data/fio-mixed.job b/tests/fiotest.data/fio-mixed.job similarity index 100% rename from tests/fiotest/data/fio-mixed.job rename to tests/fiotest.data/fio-mixed.job diff --git a/tests/fiotest/fiotest.py b/tests/fiotest.py similarity index 100% rename from tests/fiotest/fiotest.py rename to tests/fiotest.py diff --git a/tests/gendata/gendata.py b/tests/gendata.py similarity index 100% rename from tests/gendata/gendata.py rename to tests/gendata.py diff --git a/tests/linuxbuild/data/config b/tests/linuxbuild.data/config similarity index 100% rename from tests/linuxbuild/data/config rename to tests/linuxbuild.data/config diff --git a/tests/linuxbuild/linuxbuild.py b/tests/linuxbuild.py similarity index 100% rename from tests/linuxbuild/linuxbuild.py rename to tests/linuxbuild.py diff --git a/tests/multiplextest/multiplextest.mplx b/tests/multiplextest.data/multiplextest.mplx similarity index 100% rename from tests/multiplextest/multiplextest.mplx rename to tests/multiplextest.data/multiplextest.mplx diff --git a/tests/multiplextest/multiplextest.py b/tests/multiplextest.py similarity index 100% rename from tests/multiplextest/multiplextest.py rename to tests/multiplextest.py diff --git a/tests/skiptest/skiptest.py b/tests/skiptest.py similarity index 100% rename from tests/skiptest/skiptest.py rename to tests/skiptest.py diff --git a/tests/sleeptenmin/sleeptenmin.py b/tests/sleeptenmin.py similarity index 100% rename from tests/sleeptenmin/sleeptenmin.py rename to tests/sleeptenmin.py diff --git a/tests/sleeptest/sleeptest.mplx b/tests/sleeptest.data/sleeptest.mplx similarity index 100% rename from tests/sleeptest/sleeptest.mplx rename to tests/sleeptest.data/sleeptest.mplx diff --git a/tests/sleeptest/sleeptest.py b/tests/sleeptest.py similarity index 100% rename from tests/sleeptest/sleeptest.py rename to tests/sleeptest.py diff --git a/tests/synctest/synctest.mplx b/tests/synctest.data/synctest.mplx similarity index 100% rename from tests/synctest/synctest.mplx rename to tests/synctest.data/synctest.mplx diff --git a/tests/synctest/data/synctest.tar.bz2 b/tests/synctest.data/synctest.tar.bz2 similarity index 100% rename from tests/synctest/data/synctest.tar.bz2 rename to tests/synctest.data/synctest.tar.bz2 diff --git a/tests/synctest/synctest.py b/tests/synctest.py similarity index 100% rename from tests/synctest/synctest.py rename to tests/synctest.py diff --git a/tests/timeouttest/timeouttest.py b/tests/timeouttest.py similarity index 100% rename from tests/timeouttest/timeouttest.py rename to tests/timeouttest.py diff --git a/tests/trinity/data/trinity-1.4.tar.bz2 b/tests/trinity.data/trinity-1.4.tar.bz2 similarity index 100% rename from tests/trinity/data/trinity-1.4.tar.bz2 rename to tests/trinity.data/trinity-1.4.tar.bz2 diff --git a/tests/trinity/trinity.py b/tests/trinity.py similarity index 100% rename from tests/trinity/trinity.py rename to tests/trinity.py diff --git a/tests/warntest/warntest.py b/tests/warntest.py similarity index 100% rename from tests/warntest/warntest.py rename to tests/warntest.py diff --git a/tests/whiteboard/whiteboard.mplx b/tests/whiteboard.data/whiteboard.mplx similarity index 100% rename from tests/whiteboard/whiteboard.mplx rename to tests/whiteboard.data/whiteboard.mplx diff --git a/tests/whiteboard/whiteboard.py b/tests/whiteboard.py similarity index 100% rename from tests/whiteboard/whiteboard.py rename to tests/whiteboard.py -- GitLab