From 3e242360ca0bc5b3a32fe9c24a152c05d584494d Mon Sep 17 00:00:00 2001 From: Lucas Meneghel Rodrigues Date: Tue, 28 Jul 2015 05:01:49 -0300 Subject: [PATCH] avocado-vt: Bring back avocado-vt to the top level --- avocado-vt/.gitignore => .gitignore | 0 avocado-vt/.travis.yml => .travis.yml | 0 LICENSE | 9 +++------ avocado-vt/MANIFEST.in => MANIFEST.in | 0 avocado-vt/Makefile => Makefile | 0 avocado-vt/README.rst => README.rst | 0 .../avocado-plugins-vt.spec => avocado-plugins-vt.spec | 0 .../avocado => avocado}/core/plugins/virt_test.py | 0 .../avocado => avocado}/core/plugins/virt_test_list.py | 0 {avocado-vt/debian => debian}/changelog | 0 {avocado-vt/debian => debian}/compat | 0 {avocado-vt/debian => debian}/control | 0 {avocado-vt/debian => debian}/copyright | 0 {avocado-vt/debian => debian}/pyversions | 0 {avocado-vt/debian => debian}/rules | 0 {avocado-vt/debian => debian}/source/format | 0 {avocado-vt/debian => debian}/source/options | 0 {avocado-vt/debian => debian}/watch | 0 {avocado-vt/docs => docs}/Makefile | 0 {avocado-vt/docs => docs}/build/.empty | 0 {avocado-vt/docs => docs}/source/GetStartedGuide.rst | 0 {avocado-vt/docs => docs}/source/Introduction.rst | 0 {avocado-vt/docs => docs}/source/_static/.gitignore | 0 {avocado-vt/docs => docs}/source/_templates/.gitignore | 0 {avocado-vt/docs => docs}/source/conf.py | 0 {avocado-vt/docs => docs}/source/index.rst | 0 {avocado-vt/etc => etc}/avocado/conf.d/virt-test.conf | 0 {samples => examples/tests}/bad_test.py | 0 {samples => examples/tests}/guest_hostname.py | 0 {samples => examples/tests}/hostname.py | 0 {samples => examples/tests}/ls_disk.cfg | 0 {samples => examples/tests}/ls_disk.py | 0 {samples => examples/tests}/ls_disk_v2.cfg | 0 {samples => examples/tests}/service.cfg | 0 {samples => examples/tests}/service.py | 0 {samples => examples/tests}/template.py | 0 ...is-python26.txt => requirements-travis-python26.txt | 0 .../requirements-travis.txt => requirements-travis.txt | 0 samples/dropin_bad.sh | 10 ---------- samples/dropin_good.sh | 8 -------- {avocado-vt/selftests => selftests}/checkall | 0 avocado-vt/setup.py => setup.py | 0 42 files changed, 3 insertions(+), 24 deletions(-) rename avocado-vt/.gitignore => .gitignore (100%) rename avocado-vt/.travis.yml => .travis.yml (100%) rename avocado-vt/MANIFEST.in => MANIFEST.in (100%) rename avocado-vt/Makefile => Makefile (100%) rename avocado-vt/README.rst => README.rst (100%) rename avocado-vt/avocado-plugins-vt.spec => avocado-plugins-vt.spec (100%) rename {avocado-vt/avocado => avocado}/core/plugins/virt_test.py (100%) rename {avocado-vt/avocado => avocado}/core/plugins/virt_test_list.py (100%) rename {avocado-vt/debian => debian}/changelog (100%) rename {avocado-vt/debian => debian}/compat (100%) rename {avocado-vt/debian => debian}/control (100%) rename {avocado-vt/debian => debian}/copyright (100%) rename {avocado-vt/debian => debian}/pyversions (100%) rename {avocado-vt/debian => debian}/rules (100%) rename {avocado-vt/debian => debian}/source/format (100%) rename {avocado-vt/debian => debian}/source/options (100%) rename {avocado-vt/debian => debian}/watch (100%) rename {avocado-vt/docs => docs}/Makefile (100%) rename {avocado-vt/docs => docs}/build/.empty (100%) rename {avocado-vt/docs => docs}/source/GetStartedGuide.rst (100%) rename {avocado-vt/docs => docs}/source/Introduction.rst (100%) rename {avocado-vt/docs => docs}/source/_static/.gitignore (100%) rename {avocado-vt/docs => docs}/source/_templates/.gitignore (100%) rename {avocado-vt/docs => docs}/source/conf.py (100%) rename {avocado-vt/docs => docs}/source/index.rst (100%) rename {avocado-vt/etc => etc}/avocado/conf.d/virt-test.conf (100%) rename {samples => examples/tests}/bad_test.py (100%) rename {samples => examples/tests}/guest_hostname.py (100%) rename {samples => examples/tests}/hostname.py (100%) rename {samples => examples/tests}/ls_disk.cfg (100%) rename {samples => examples/tests}/ls_disk.py (100%) rename {samples => examples/tests}/ls_disk_v2.cfg (100%) rename {samples => examples/tests}/service.cfg (100%) rename {samples => examples/tests}/service.py (100%) rename {samples => examples/tests}/template.py (100%) rename avocado-vt/requirements-travis-python26.txt => requirements-travis-python26.txt (100%) rename avocado-vt/requirements-travis.txt => requirements-travis.txt (100%) delete mode 100644 samples/dropin_bad.sh delete mode 100644 samples/dropin_good.sh rename {avocado-vt/selftests => selftests}/checkall (100%) rename avocado-vt/setup.py => setup.py (100%) diff --git a/avocado-vt/.gitignore b/.gitignore similarity index 100% rename from avocado-vt/.gitignore rename to .gitignore diff --git a/avocado-vt/.travis.yml b/.travis.yml similarity index 100% rename from avocado-vt/.travis.yml rename to .travis.yml diff --git a/LICENSE b/LICENSE index 9340f2714c..88820ef5d5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,12 @@ -virt-test is released specifically under the GPLv2, and not any -later version of the license, unless explicitly otherwise stated - -All files in the virt-test project are covered by the GPLv2, unless -explicitly otherwise stated. +Unless explicitly otherwise stated, all files in the avocado-vt repository +are covered by the GPLv2+ (i.e: v2, or any later version). GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/avocado-vt/MANIFEST.in b/MANIFEST.in similarity index 100% rename from avocado-vt/MANIFEST.in rename to MANIFEST.in diff --git a/avocado-vt/Makefile b/Makefile similarity index 100% rename from avocado-vt/Makefile rename to Makefile diff --git a/avocado-vt/README.rst b/README.rst similarity index 100% rename from avocado-vt/README.rst rename to README.rst diff --git a/avocado-vt/avocado-plugins-vt.spec b/avocado-plugins-vt.spec similarity index 100% rename from avocado-vt/avocado-plugins-vt.spec rename to avocado-plugins-vt.spec diff --git a/avocado-vt/avocado/core/plugins/virt_test.py b/avocado/core/plugins/virt_test.py similarity index 100% rename from avocado-vt/avocado/core/plugins/virt_test.py rename to avocado/core/plugins/virt_test.py diff --git a/avocado-vt/avocado/core/plugins/virt_test_list.py b/avocado/core/plugins/virt_test_list.py similarity index 100% rename from avocado-vt/avocado/core/plugins/virt_test_list.py rename to avocado/core/plugins/virt_test_list.py diff --git a/avocado-vt/debian/changelog b/debian/changelog similarity index 100% rename from avocado-vt/debian/changelog rename to debian/changelog diff --git a/avocado-vt/debian/compat b/debian/compat similarity index 100% rename from avocado-vt/debian/compat rename to debian/compat diff --git a/avocado-vt/debian/control b/debian/control similarity index 100% rename from avocado-vt/debian/control rename to debian/control diff --git a/avocado-vt/debian/copyright b/debian/copyright similarity index 100% rename from avocado-vt/debian/copyright rename to debian/copyright diff --git a/avocado-vt/debian/pyversions b/debian/pyversions similarity index 100% rename from avocado-vt/debian/pyversions rename to debian/pyversions diff --git a/avocado-vt/debian/rules b/debian/rules similarity index 100% rename from avocado-vt/debian/rules rename to debian/rules diff --git a/avocado-vt/debian/source/format b/debian/source/format similarity index 100% rename from avocado-vt/debian/source/format rename to debian/source/format diff --git a/avocado-vt/debian/source/options b/debian/source/options similarity index 100% rename from avocado-vt/debian/source/options rename to debian/source/options diff --git a/avocado-vt/debian/watch b/debian/watch similarity index 100% rename from avocado-vt/debian/watch rename to debian/watch diff --git a/avocado-vt/docs/Makefile b/docs/Makefile similarity index 100% rename from avocado-vt/docs/Makefile rename to docs/Makefile diff --git a/avocado-vt/docs/build/.empty b/docs/build/.empty similarity index 100% rename from avocado-vt/docs/build/.empty rename to docs/build/.empty diff --git a/avocado-vt/docs/source/GetStartedGuide.rst b/docs/source/GetStartedGuide.rst similarity index 100% rename from avocado-vt/docs/source/GetStartedGuide.rst rename to docs/source/GetStartedGuide.rst diff --git a/avocado-vt/docs/source/Introduction.rst b/docs/source/Introduction.rst similarity index 100% rename from avocado-vt/docs/source/Introduction.rst rename to docs/source/Introduction.rst diff --git a/avocado-vt/docs/source/_static/.gitignore b/docs/source/_static/.gitignore similarity index 100% rename from avocado-vt/docs/source/_static/.gitignore rename to docs/source/_static/.gitignore diff --git a/avocado-vt/docs/source/_templates/.gitignore b/docs/source/_templates/.gitignore similarity index 100% rename from avocado-vt/docs/source/_templates/.gitignore rename to docs/source/_templates/.gitignore diff --git a/avocado-vt/docs/source/conf.py b/docs/source/conf.py similarity index 100% rename from avocado-vt/docs/source/conf.py rename to docs/source/conf.py diff --git a/avocado-vt/docs/source/index.rst b/docs/source/index.rst similarity index 100% rename from avocado-vt/docs/source/index.rst rename to docs/source/index.rst diff --git a/avocado-vt/etc/avocado/conf.d/virt-test.conf b/etc/avocado/conf.d/virt-test.conf similarity index 100% rename from avocado-vt/etc/avocado/conf.d/virt-test.conf rename to etc/avocado/conf.d/virt-test.conf diff --git a/samples/bad_test.py b/examples/tests/bad_test.py similarity index 100% rename from samples/bad_test.py rename to examples/tests/bad_test.py diff --git a/samples/guest_hostname.py b/examples/tests/guest_hostname.py similarity index 100% rename from samples/guest_hostname.py rename to examples/tests/guest_hostname.py diff --git a/samples/hostname.py b/examples/tests/hostname.py similarity index 100% rename from samples/hostname.py rename to examples/tests/hostname.py diff --git a/samples/ls_disk.cfg b/examples/tests/ls_disk.cfg similarity index 100% rename from samples/ls_disk.cfg rename to examples/tests/ls_disk.cfg diff --git a/samples/ls_disk.py b/examples/tests/ls_disk.py similarity index 100% rename from samples/ls_disk.py rename to examples/tests/ls_disk.py diff --git a/samples/ls_disk_v2.cfg b/examples/tests/ls_disk_v2.cfg similarity index 100% rename from samples/ls_disk_v2.cfg rename to examples/tests/ls_disk_v2.cfg diff --git a/samples/service.cfg b/examples/tests/service.cfg similarity index 100% rename from samples/service.cfg rename to examples/tests/service.cfg diff --git a/samples/service.py b/examples/tests/service.py similarity index 100% rename from samples/service.py rename to examples/tests/service.py diff --git a/samples/template.py b/examples/tests/template.py similarity index 100% rename from samples/template.py rename to examples/tests/template.py diff --git a/avocado-vt/requirements-travis-python26.txt b/requirements-travis-python26.txt similarity index 100% rename from avocado-vt/requirements-travis-python26.txt rename to requirements-travis-python26.txt diff --git a/avocado-vt/requirements-travis.txt b/requirements-travis.txt similarity index 100% rename from avocado-vt/requirements-travis.txt rename to requirements-travis.txt diff --git a/samples/dropin_bad.sh b/samples/dropin_bad.sh deleted file mode 100644 index e628d1e039..0000000000 --- a/samples/dropin_bad.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# difficulty: simplest -# This test tries to execute "missing_command", which shouldn't be installed -# thus this test should FAIL. - -# Put this file into $virttest/dropin directory, allow execution rights and -# execute runner with -run-dropin -# Please note that all dropin tests are executed. -missing_command diff --git a/samples/dropin_good.sh b/samples/dropin_good.sh deleted file mode 100644 index 45086054a9..0000000000 --- a/samples/dropin_good.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# difficulty: simplest -# This test logs the hostname into debug_log. - -# Put this file into $virttest/dropin directory, allow execution rights and -# execute runner with -run-dropin -hostname diff --git a/avocado-vt/selftests/checkall b/selftests/checkall similarity index 100% rename from avocado-vt/selftests/checkall rename to selftests/checkall diff --git a/avocado-vt/setup.py b/setup.py similarity index 100% rename from avocado-vt/setup.py rename to setup.py