Move python test files to test/py
authorIustin Pop <iustin@google.com>
Tue, 25 Dec 2012 23:15:05 +0000 (00:15 +0100)
committerIustin Pop <iustin@google.com>
Thu, 27 Dec 2012 13:34:05 +0000 (14:34 +0100)
This is the first step of the test files reorganisation: moving test/*
(except test/data) to new directory test/py/.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

91 files changed:
Makefile.am
autotools/gen-coverage
doc/devnotes.rst
test/py/bash_completion.bash [moved from test/bash_completion.bash with 100% similarity]
test/py/cfgupgrade_unittest.py [moved from test/cfgupgrade_unittest.py with 100% similarity]
test/py/check-cert-expired_unittest.bash [moved from test/check-cert-expired_unittest.bash with 94% similarity]
test/py/cli-test.bash [moved from test/cli-test.bash with 75% similarity]
test/py/daemon-util_unittest.bash [moved from test/daemon-util_unittest.bash with 100% similarity]
test/py/docs_unittest.py [moved from test/docs_unittest.py with 100% similarity]
test/py/ganeti-cleaner_unittest.bash [moved from test/ganeti-cleaner_unittest.bash with 98% similarity]
test/py/ganeti-cli.test [moved from test/ganeti-cli.test with 100% similarity]
test/py/ganeti.asyncnotifier_unittest.py [moved from test/ganeti.asyncnotifier_unittest.py with 100% similarity]
test/py/ganeti.backend_unittest-runasroot.py [moved from test/ganeti.backend_unittest-runasroot.py with 100% similarity]
test/py/ganeti.backend_unittest.py [moved from test/ganeti.backend_unittest.py with 100% similarity]
test/py/ganeti.bdev_unittest.py [moved from test/ganeti.bdev_unittest.py with 100% similarity]
test/py/ganeti.cli_unittest.py [moved from test/ganeti.cli_unittest.py with 100% similarity]
test/py/ganeti.client.gnt_cluster_unittest.py [moved from test/ganeti.client.gnt_cluster_unittest.py with 100% similarity]
test/py/ganeti.client.gnt_instance_unittest.py [moved from test/ganeti.client.gnt_instance_unittest.py with 100% similarity]
test/py/ganeti.client.gnt_job_unittest.py [moved from test/ganeti.client.gnt_job_unittest.py with 100% similarity]
test/py/ganeti.cmdlib_unittest.py [moved from test/ganeti.cmdlib_unittest.py with 100% similarity]
test/py/ganeti.compat_unittest.py [moved from test/ganeti.compat_unittest.py with 100% similarity]
test/py/ganeti.confd.client_unittest.py [moved from test/ganeti.confd.client_unittest.py with 100% similarity]
test/py/ganeti.config_unittest.py [moved from test/ganeti.config_unittest.py with 100% similarity]
test/py/ganeti.constants_unittest.py [moved from test/ganeti.constants_unittest.py with 100% similarity]
test/py/ganeti.daemon_unittest.py [moved from test/ganeti.daemon_unittest.py with 100% similarity]
test/py/ganeti.errors_unittest.py [moved from test/ganeti.errors_unittest.py with 100% similarity]
test/py/ganeti.hooks_unittest.py [moved from test/ganeti.hooks_unittest.py with 100% similarity]
test/py/ganeti.ht_unittest.py [moved from test/ganeti.ht_unittest.py with 100% similarity]
test/py/ganeti.http_unittest.py [moved from test/ganeti.http_unittest.py with 100% similarity]
test/py/ganeti.hypervisor.hv_chroot_unittest.py [moved from test/ganeti.hypervisor.hv_chroot_unittest.py with 100% similarity]
test/py/ganeti.hypervisor.hv_fake_unittest.py [moved from test/ganeti.hypervisor.hv_fake_unittest.py with 100% similarity]
test/py/ganeti.hypervisor.hv_kvm_unittest.py [moved from test/ganeti.hypervisor.hv_kvm_unittest.py with 100% similarity]
test/py/ganeti.hypervisor.hv_lxc_unittest.py [moved from test/ganeti.hypervisor.hv_lxc_unittest.py with 100% similarity]
test/py/ganeti.hypervisor.hv_xen_unittest.py [moved from test/ganeti.hypervisor.hv_xen_unittest.py with 100% similarity]
test/py/ganeti.hypervisor_unittest.py [moved from test/ganeti.hypervisor_unittest.py with 100% similarity]
test/py/ganeti.impexpd_unittest.py [moved from test/ganeti.impexpd_unittest.py with 100% similarity]
test/py/ganeti.jqueue_unittest.py [moved from test/ganeti.jqueue_unittest.py with 100% similarity]
test/py/ganeti.jstore_unittest.py [moved from test/ganeti.jstore_unittest.py with 100% similarity]
test/py/ganeti.locking_unittest.py [moved from test/ganeti.locking_unittest.py with 100% similarity]
test/py/ganeti.luxi_unittest.py [moved from test/ganeti.luxi_unittest.py with 100% similarity]
test/py/ganeti.masterd.iallocator_unittest.py [moved from test/ganeti.masterd.iallocator_unittest.py with 100% similarity]
test/py/ganeti.masterd.instance_unittest.py [moved from test/ganeti.masterd.instance_unittest.py with 100% similarity]
test/py/ganeti.mcpu_unittest.py [moved from test/ganeti.mcpu_unittest.py with 100% similarity]
test/py/ganeti.netutils_unittest.py [moved from test/ganeti.netutils_unittest.py with 100% similarity]
test/py/ganeti.objects_unittest.py [moved from test/ganeti.objects_unittest.py with 100% similarity]
test/py/ganeti.objectutils_unittest.py [moved from test/ganeti.objectutils_unittest.py with 100% similarity]
test/py/ganeti.opcodes_unittest.py [moved from test/ganeti.opcodes_unittest.py with 100% similarity]
test/py/ganeti.ovf_unittest.py [moved from test/ganeti.ovf_unittest.py with 100% similarity]
test/py/ganeti.qlang_unittest.py [moved from test/ganeti.qlang_unittest.py with 100% similarity]
test/py/ganeti.query_unittest.py [moved from test/ganeti.query_unittest.py with 100% similarity]
test/py/ganeti.rapi.baserlib_unittest.py [moved from test/ganeti.rapi.baserlib_unittest.py with 100% similarity]
test/py/ganeti.rapi.client_unittest.py [moved from test/ganeti.rapi.client_unittest.py with 100% similarity]
test/py/ganeti.rapi.resources_unittest.py [moved from test/ganeti.rapi.resources_unittest.py with 100% similarity]
test/py/ganeti.rapi.rlib2_unittest.py [moved from test/ganeti.rapi.rlib2_unittest.py with 100% similarity]
test/py/ganeti.rapi.testutils_unittest.py [moved from test/ganeti.rapi.testutils_unittest.py with 100% similarity]
test/py/ganeti.rpc_unittest.py [moved from test/ganeti.rpc_unittest.py with 100% similarity]
test/py/ganeti.runtime_unittest.py [moved from test/ganeti.runtime_unittest.py with 100% similarity]
test/py/ganeti.serializer_unittest.py [moved from test/ganeti.serializer_unittest.py with 100% similarity]
test/py/ganeti.server.rapi_unittest.py [moved from test/ganeti.server.rapi_unittest.py with 100% similarity]
test/py/ganeti.ssconf_unittest.py [moved from test/ganeti.ssconf_unittest.py with 100% similarity]
test/py/ganeti.ssh_unittest.py [moved from test/ganeti.ssh_unittest.py with 100% similarity]
test/py/ganeti.storage_unittest.py [moved from test/ganeti.storage_unittest.py with 100% similarity]
test/py/ganeti.tools.ensure_dirs_unittest.py [moved from test/ganeti.tools.ensure_dirs_unittest.py with 100% similarity]
test/py/ganeti.tools.node_daemon_setup_unittest.py [moved from test/ganeti.tools.node_daemon_setup_unittest.py with 100% similarity]
test/py/ganeti.tools.prepare_node_join_unittest.py [moved from test/ganeti.tools.prepare_node_join_unittest.py with 100% similarity]
test/py/ganeti.uidpool_unittest.py [moved from test/ganeti.uidpool_unittest.py with 100% similarity]
test/py/ganeti.utils.algo_unittest.py [moved from test/ganeti.utils.algo_unittest.py with 100% similarity]
test/py/ganeti.utils.filelock_unittest.py [moved from test/ganeti.utils.filelock_unittest.py with 100% similarity]
test/py/ganeti.utils.hash_unittest.py [moved from test/ganeti.utils.hash_unittest.py with 100% similarity]
test/py/ganeti.utils.io_unittest-runasroot.py [moved from test/ganeti.utils.io_unittest-runasroot.py with 100% similarity]
test/py/ganeti.utils.io_unittest.py [moved from test/ganeti.utils.io_unittest.py with 100% similarity]
test/py/ganeti.utils.log_unittest.py [moved from test/ganeti.utils.log_unittest.py with 100% similarity]
test/py/ganeti.utils.mlock_unittest.py [moved from test/ganeti.utils.mlock_unittest.py with 100% similarity]
test/py/ganeti.utils.nodesetup_unittest.py [moved from test/ganeti.utils.nodesetup_unittest.py with 100% similarity]
test/py/ganeti.utils.process_unittest.py [moved from test/ganeti.utils.process_unittest.py with 100% similarity]
test/py/ganeti.utils.retry_unittest.py [moved from test/ganeti.utils.retry_unittest.py with 100% similarity]
test/py/ganeti.utils.text_unittest.py [moved from test/ganeti.utils.text_unittest.py with 100% similarity]
test/py/ganeti.utils.wrapper_unittest.py [moved from test/ganeti.utils.wrapper_unittest.py with 100% similarity]
test/py/ganeti.utils.x509_unittest.py [moved from test/ganeti.utils.x509_unittest.py with 100% similarity]
test/py/ganeti.utils_unittest.py [moved from test/ganeti.utils_unittest.py with 100% similarity]
test/py/ganeti.vcluster_unittest.py [moved from test/ganeti.vcluster_unittest.py with 100% similarity]
test/py/ganeti.workerpool_unittest.py [moved from test/ganeti.workerpool_unittest.py with 100% similarity]
test/py/gnt-cli.test [moved from test/gnt-cli.test with 100% similarity]
test/py/import-export_unittest-helper [moved from test/import-export_unittest-helper with 100% similarity]
test/py/import-export_unittest.bash [moved from test/import-export_unittest.bash with 99% similarity]
test/py/lockperf.py [moved from test/lockperf.py with 100% similarity]
test/py/mocks.py [moved from test/mocks.py with 100% similarity]
test/py/pycurl_reset_unittest.py [moved from test/pycurl_reset_unittest.py with 100% similarity]
test/py/qa.qa_config_unittest.py [moved from test/qa.qa_config_unittest.py with 100% similarity]
test/py/tempfile_fork_unittest.py [moved from test/tempfile_fork_unittest.py with 100% similarity]
test/py/testutils.py [moved from test/testutils.py with 100% similarity]

index d024e8a..0b0bfe7 100644 (file)
@@ -106,6 +106,7 @@ DIRS = \
        test/data \
        test/data/ovfdata \
        test/data/ovfdata/other \
+       test/py \
        tools
 
 ALL_APIDOC_HS_DIRS = \
@@ -814,9 +815,9 @@ EXTRA_DIST = \
        doc/examples/gnt-debug/README \
        doc/examples/gnt-debug/delay0.json \
        doc/examples/gnt-debug/delay50.json \
-       test/lockperf.py \
-       test/testutils.py \
-       test/mocks.py \
+       test/py/lockperf.py \
+       test/py/testutils.py \
+       test/py/mocks.py \
        $(dist_TESTS) \
        $(TEST_FILES) \
        man/footer.rst \
@@ -956,98 +957,98 @@ TEST_FILES = \
        test/data/vgreduce-removemissing-2.02.66-ok.txt \
        test/data/vgs-missing-pvs-2.02.02.txt \
        test/data/vgs-missing-pvs-2.02.66.txt \
-       test/ganeti-cli.test \
-       test/gnt-cli.test \
-       test/import-export_unittest-helper
+       test/py/ganeti-cli.test \
+       test/py/gnt-cli.test \
+       test/py/import-export_unittest-helper
 
 python_tests = \
        doc/examples/rapi_testutils.py \
-       test/cfgupgrade_unittest.py \
-       test/docs_unittest.py \
-       test/ganeti.asyncnotifier_unittest.py \
-       test/ganeti.backend_unittest-runasroot.py \
-       test/ganeti.backend_unittest.py \
-       test/ganeti.bdev_unittest.py \
-       test/ganeti.cli_unittest.py \
-       test/ganeti.client.gnt_cluster_unittest.py \
-       test/ganeti.client.gnt_instance_unittest.py \
-       test/ganeti.client.gnt_job_unittest.py \
-       test/ganeti.cmdlib_unittest.py \
-       test/ganeti.compat_unittest.py \
-       test/ganeti.confd.client_unittest.py \
-       test/ganeti.config_unittest.py \
-       test/ganeti.constants_unittest.py \
-       test/ganeti.daemon_unittest.py \
-       test/ganeti.errors_unittest.py \
-       test/ganeti.hooks_unittest.py \
-       test/ganeti.ht_unittest.py \
-       test/ganeti.http_unittest.py \
-       test/ganeti.hypervisor.hv_chroot_unittest.py \
-       test/ganeti.hypervisor.hv_fake_unittest.py \
-       test/ganeti.hypervisor.hv_kvm_unittest.py \
-       test/ganeti.hypervisor.hv_lxc_unittest.py \
-       test/ganeti.hypervisor.hv_xen_unittest.py \
-       test/ganeti.hypervisor_unittest.py \
-       test/ganeti.impexpd_unittest.py \
-       test/ganeti.jqueue_unittest.py \
-       test/ganeti.jstore_unittest.py \
-       test/ganeti.locking_unittest.py \
-       test/ganeti.luxi_unittest.py \
-       test/ganeti.masterd.iallocator_unittest.py \
-       test/ganeti.masterd.instance_unittest.py \
-       test/ganeti.mcpu_unittest.py \
-       test/ganeti.netutils_unittest.py \
-       test/ganeti.objects_unittest.py \
-       test/ganeti.objectutils_unittest.py \
-       test/ganeti.opcodes_unittest.py \
-       test/ganeti.ovf_unittest.py \
-       test/ganeti.qlang_unittest.py \
-       test/ganeti.query_unittest.py \
-       test/ganeti.rapi.baserlib_unittest.py \
-       test/ganeti.rapi.client_unittest.py \
-       test/ganeti.rapi.resources_unittest.py \
-       test/ganeti.rapi.rlib2_unittest.py \
-       test/ganeti.rapi.testutils_unittest.py \
-       test/ganeti.rpc_unittest.py \
-       test/ganeti.runtime_unittest.py \
-       test/ganeti.serializer_unittest.py \
-       test/ganeti.server.rapi_unittest.py \
-       test/ganeti.ssconf_unittest.py \
-       test/ganeti.ssh_unittest.py \
-       test/ganeti.storage_unittest.py \
-       test/ganeti.tools.ensure_dirs_unittest.py \
-       test/ganeti.tools.node_daemon_setup_unittest.py \
-       test/ganeti.tools.prepare_node_join_unittest.py \
-       test/ganeti.uidpool_unittest.py \
-       test/ganeti.utils.algo_unittest.py \
-       test/ganeti.utils.filelock_unittest.py \
-       test/ganeti.utils.hash_unittest.py \
-       test/ganeti.utils.io_unittest-runasroot.py \
-       test/ganeti.utils.io_unittest.py \
-       test/ganeti.utils.log_unittest.py \
-       test/ganeti.utils.mlock_unittest.py \
-       test/ganeti.utils.nodesetup_unittest.py \
-       test/ganeti.utils.process_unittest.py \
-       test/ganeti.utils.retry_unittest.py \
-       test/ganeti.utils.text_unittest.py \
-       test/ganeti.utils.wrapper_unittest.py \
-       test/ganeti.utils.x509_unittest.py \
-       test/ganeti.utils_unittest.py \
-       test/ganeti.vcluster_unittest.py \
-       test/ganeti.workerpool_unittest.py \
-       test/pycurl_reset_unittest.py \
-       test/qa.qa_config_unittest.py \
-       test/tempfile_fork_unittest.py
+       test/py/cfgupgrade_unittest.py \
+       test/py/docs_unittest.py \
+       test/py/ganeti.asyncnotifier_unittest.py \
+       test/py/ganeti.backend_unittest-runasroot.py \
+       test/py/ganeti.backend_unittest.py \
+       test/py/ganeti.bdev_unittest.py \
+       test/py/ganeti.cli_unittest.py \
+       test/py/ganeti.client.gnt_cluster_unittest.py \
+       test/py/ganeti.client.gnt_instance_unittest.py \
+       test/py/ganeti.client.gnt_job_unittest.py \
+       test/py/ganeti.cmdlib_unittest.py \
+       test/py/ganeti.compat_unittest.py \
+       test/py/ganeti.confd.client_unittest.py \
+       test/py/ganeti.config_unittest.py \
+       test/py/ganeti.constants_unittest.py \
+       test/py/ganeti.daemon_unittest.py \
+       test/py/ganeti.errors_unittest.py \
+       test/py/ganeti.hooks_unittest.py \
+       test/py/ganeti.ht_unittest.py \
+       test/py/ganeti.http_unittest.py \
+       test/py/ganeti.hypervisor.hv_chroot_unittest.py \
+       test/py/ganeti.hypervisor.hv_fake_unittest.py \
+       test/py/ganeti.hypervisor.hv_kvm_unittest.py \
+       test/py/ganeti.hypervisor.hv_lxc_unittest.py \
+       test/py/ganeti.hypervisor.hv_xen_unittest.py \
+       test/py/ganeti.hypervisor_unittest.py \
+       test/py/ganeti.impexpd_unittest.py \
+       test/py/ganeti.jqueue_unittest.py \
+       test/py/ganeti.jstore_unittest.py \
+       test/py/ganeti.locking_unittest.py \
+       test/py/ganeti.luxi_unittest.py \
+       test/py/ganeti.masterd.iallocator_unittest.py \
+       test/py/ganeti.masterd.instance_unittest.py \
+       test/py/ganeti.mcpu_unittest.py \
+       test/py/ganeti.netutils_unittest.py \
+       test/py/ganeti.objects_unittest.py \
+       test/py/ganeti.objectutils_unittest.py \
+       test/py/ganeti.opcodes_unittest.py \
+       test/py/ganeti.ovf_unittest.py \
+       test/py/ganeti.qlang_unittest.py \
+       test/py/ganeti.query_unittest.py \
+       test/py/ganeti.rapi.baserlib_unittest.py \
+       test/py/ganeti.rapi.client_unittest.py \
+       test/py/ganeti.rapi.resources_unittest.py \
+       test/py/ganeti.rapi.rlib2_unittest.py \
+       test/py/ganeti.rapi.testutils_unittest.py \
+       test/py/ganeti.rpc_unittest.py \
+       test/py/ganeti.runtime_unittest.py \
+       test/py/ganeti.serializer_unittest.py \
+       test/py/ganeti.server.rapi_unittest.py \
+       test/py/ganeti.ssconf_unittest.py \
+       test/py/ganeti.ssh_unittest.py \
+       test/py/ganeti.storage_unittest.py \
+       test/py/ganeti.tools.ensure_dirs_unittest.py \
+       test/py/ganeti.tools.node_daemon_setup_unittest.py \
+       test/py/ganeti.tools.prepare_node_join_unittest.py \
+       test/py/ganeti.uidpool_unittest.py \
+       test/py/ganeti.utils.algo_unittest.py \
+       test/py/ganeti.utils.filelock_unittest.py \
+       test/py/ganeti.utils.hash_unittest.py \
+       test/py/ganeti.utils.io_unittest-runasroot.py \
+       test/py/ganeti.utils.io_unittest.py \
+       test/py/ganeti.utils.log_unittest.py \
+       test/py/ganeti.utils.mlock_unittest.py \
+       test/py/ganeti.utils.nodesetup_unittest.py \
+       test/py/ganeti.utils.process_unittest.py \
+       test/py/ganeti.utils.retry_unittest.py \
+       test/py/ganeti.utils.text_unittest.py \
+       test/py/ganeti.utils.wrapper_unittest.py \
+       test/py/ganeti.utils.x509_unittest.py \
+       test/py/ganeti.utils_unittest.py \
+       test/py/ganeti.vcluster_unittest.py \
+       test/py/ganeti.workerpool_unittest.py \
+       test/py/pycurl_reset_unittest.py \
+       test/py/qa.qa_config_unittest.py \
+       test/py/tempfile_fork_unittest.py
 
 haskell_tests = htest/test
 
 dist_TESTS = \
-       test/check-cert-expired_unittest.bash \
-       test/daemon-util_unittest.bash \
-       test/ganeti-cleaner_unittest.bash \
-       test/import-export_unittest.bash \
-       test/cli-test.bash \
-       test/bash_completion.bash \
+       test/py/check-cert-expired_unittest.bash \
+       test/py/daemon-util_unittest.bash \
+       test/py/ganeti-cleaner_unittest.bash \
+       test/py/import-export_unittest.bash \
+       test/py/cli-test.bash \
+       test/py/bash_completion.bash \
        $(python_tests)
 
 nodist_TESTS =
@@ -1099,12 +1100,12 @@ all_python_code = \
 
 srclink_files = \
        man/footer.rst \
-       test/check-cert-expired_unittest.bash \
-       test/daemon-util_unittest.bash \
-       test/ganeti-cleaner_unittest.bash \
-       test/import-export_unittest.bash \
-       test/cli-test.bash \
-       test/bash_completion.bash \
+       test/py/check-cert-expired_unittest.bash \
+       test/py/daemon-util_unittest.bash \
+       test/py/ganeti-cleaner_unittest.bash \
+       test/py/import-export_unittest.bash \
+       test/py/cli-test.bash \
+       test/py/bash_completion.bash \
        htest/offline-test.sh \
        htest/cli-tests-defs.sh \
        $(all_python_code) \
@@ -1145,11 +1146,11 @@ pep8_python_code = \
        $(PYTHON_BOOTSTRAP) \
        qa
 
-test/daemon-util_unittest.bash: daemons/daemon-util
+test/py/daemon-util_unittest.bash: daemons/daemon-util
 
-test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
+test/py/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
 
-test/bash_completion.bash: doc/examples/bash_completion-debug
+test/py/bash_completion.bash: doc/examples/bash_completion-debug
 
 tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
index 38bdd38..d16e66b 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 
-# Copyright (C) 2010, 2011 Google Inc.
+# Copyright (C) 2010, 2011, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ set -u
 
 reportargs=(
   '--include=*'
-  '--omit=test/*'
+  '--omit=test/py/*'
   )
 
 $COVERAGE erase
index 6744425..77112dd 100644 (file)
@@ -176,7 +176,7 @@ so for shell-tests (but these are faster, so it shouldn't be needed).
 For Python tests::
 
   $ export PYTHONPATH=$PWD
-  $ python ./test/ganeti.%mytest%
+  $ python ./test/py/ganeti.%mytest%
 
 For Haskell tests::
 
similarity index 94%
rename from test/check-cert-expired_unittest.bash
rename to test/py/check-cert-expired_unittest.bash
index ab4f453..fbdba38 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ err() {
 }
 
 impexpd_helper() {
-  $PYTHON "${TOP_SRCDIR:-.}/test/import-export_unittest-helper" "$@"
+  $PYTHON "${TOP_SRCDIR:-.}/test/py/import-export_unittest-helper" "$@"
 }
 
 $CCE 2>/dev/null && err 'Accepted empty argument list'
similarity index 75%
rename from test/cli-test.bash
rename to test/py/cli-test.bash
index f768a5a..aea5edd 100755 (executable)
@@ -4,5 +4,5 @@ export SCRIPTS=${TOP_BUILDDIR:-.}/scripts
 export DAEMONS=${TOP_BUILDDIR:-.}/daemons
 
 shelltest $SHELLTESTARGS \
-  ${TOP_SRCDIR:-.}/test/{gnt,ganeti}-*.test \
+  ${TOP_SRCDIR:-.}/test/py/{gnt,ganeti}-*.test \
   -- --hide-successes
similarity index 98%
rename from test/ganeti-cleaner_unittest.bash
rename to test/py/ganeti-cleaner_unittest.bash
index 74eb996..bf57b76 100755 (executable)
@@ -39,7 +39,7 @@ upto() {
 gencert() {
   local path=$1 validity=$2
   VALIDITY=$validity $PYTHON \
-    ${TOP_SRCDIR:-.}/test/import-export_unittest-helper \
+    ${TOP_SRCDIR:-.}/test/py/import-export_unittest-helper \
     $path gencert
 }
 
similarity index 100%
rename from test/ganeti-cli.test
rename to test/py/ganeti-cli.test
similarity index 100%
rename from test/gnt-cli.test
rename to test/py/gnt-cli.test
similarity index 99%
rename from test/import-export_unittest.bash
rename to test/py/import-export_unittest.bash
index 318ce5c..b1672b4 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -144,7 +144,7 @@ cat $(get_testfile proc_drbd8.txt) $(get_testfile cert1.pem) > $testdata
 } > $largetestdata
 
 impexpd_helper() {
-  $PYTHON $(get_testpath)/import-export_unittest-helper "$@"
+  $PYTHON $(get_testpath)/py/import-export_unittest-helper "$@"
 }
 
 start_test() {
similarity index 100%
rename from test/lockperf.py
rename to test/py/lockperf.py
similarity index 100%
rename from test/mocks.py
rename to test/py/mocks.py
similarity index 100%
rename from test/testutils.py
rename to test/py/testutils.py