[Ryu-devel] [PATCH v2] tests: Revert some test files

IWASE Yusuke

2017-07-01 13:37:59 UTC

This patch puts some test files back which seperated by the following
commit.
[Ryu-devel] [PATCH] tests: Separate test files from Ryu module

Signed-off-by: IWASE Yusuke <***@gmail.com>
---
.travis.yml | 2 +-
{tests/integrated/common => ryu/tests/integrated}/__init__.py | 0
ryu/tests/integrated/common/__init__.py | 0
{tests => ryu/tests}/integrated/common/docker_base.py | 0
{tests => ryu/tests}/integrated/common/install_docker_test_pkg.sh | 0
.../tests}/integrated/common/install_docker_test_pkg_common.sh | 0
.../tests}/integrated/common/install_docker_test_pkg_for_travis.sh | 0
{tests => ryu/tests}/integrated/common/quagga.py | 0
{tests => ryu/tests}/integrated/common/ryubgp.py | 0
tests/integrated/bgp/base.py | 6 +++---
tests/integrated/bgp/base_ip6.py | 6 +++---
tests/integrated/bgp/test_basic.py | 3 ++-
tests/integrated/bgp/test_ip6_basic.py | 3 ++-
13 files changed, 11 insertions(+), 9 deletions(-)
rename {tests/integrated/common => ryu/tests/integrated}/__init__.py (100%)
create mode 100644 ryu/tests/integrated/common/__init__.py
rename {tests => ryu/tests}/integrated/common/docker_base.py (100%)
rename {tests => ryu/tests}/integrated/common/install_docker_test_pkg.sh (100%)
rename {tests => ryu/tests}/integrated/common/install_docker_test_pkg_common.sh (100%)
rename {tests => ryu/tests}/integrated/common/install_docker_test_pkg_for_travis.sh (100%)
rename {tests => ryu/tests}/integrated/common/quagga.py (100%)
rename {tests => ryu/tests}/integrated/common/ryubgp.py (100%)

diff --git a/.travis.yml b/.travis.yml
index 7f35ff2..9e5474a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ sudo: required # Required to enable Docker service

install:
- pip install tox coveralls
- - bash tests/integrated/common/install_docker_test_pkg_for_travis.sh
+ - bash ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh

script:
- NOSE_VERBOSE=0 tox -e $TOX_ENV
diff --git a/tests/integrated/common/__init__.py b/ryu/tests/integrated/__init__.py
similarity index 100%
rename from tests/integrated/common/__init__.py
rename to ryu/tests/integrated/__init__.py
diff --git a/ryu/tests/integrated/common/__init__.py b/ryu/tests/integrated/common/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/integrated/common/docker_base.py b/ryu/tests/integrated/common/docker_base.py
similarity index 100%
rename from tests/integrated/common/docker_base.py
rename to ryu/tests/integrated/common/docker_base.py
diff --git a/tests/integrated/common/install_docker_test_pkg.sh b/ryu/tests/integrated/common/install_docker_test_pkg.sh
similarity index 100%
rename from tests/integrated/common/install_docker_test_pkg.sh
rename to ryu/tests/integrated/common/install_docker_test_pkg.sh
diff --git a/tests/integrated/common/install_docker_test_pkg_common.sh b/ryu/tests/integrated/common/install_docker_test_pkg_common.sh
similarity index 100%
rename from tests/integrated/common/install_docker_test_pkg_common.sh
rename to ryu/tests/integrated/common/install_docker_test_pkg_common.sh
diff --git a/tests/integrated/common/install_docker_test_pkg_for_travis.sh b/ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
similarity index 100%
rename from tests/integrated/common/install_docker_test_pkg_for_travis.sh
rename to ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
diff --git a/tests/integrated/common/quagga.py b/ryu/tests/integrated/common/quagga.py
similarity index 100%
rename from tests/integrated/common/quagga.py
rename to ryu/tests/integrated/common/quagga.py
diff --git a/tests/integrated/common/ryubgp.py b/ryu/tests/integrated/common/ryubgp.py
similarity index 100%
rename from tests/integrated/common/ryubgp.py
rename to ryu/tests/integrated/common/ryubgp.py
diff --git a/tests/integrated/bgp/base.py b/tests/integrated/bgp/base.py
index 9d05707..26fa396 100644
--- a/tests/integrated/bgp/base.py
+++ b/tests/integrated/bgp/base.py
@@ -20,9 +20,9 @@ import logging
import sys
import unittest

-from tests.integrated.common import docker_base as ctn_base
-from tests.integrated.common import ryubgp
-from tests.integrated.common import quagga
+from ryu.tests.integrated.common import docker_base as ctn_base
+from ryu.tests.integrated.common import ryubgp
+from ryu.tests.integrated.common import quagga

LOG = logging.getLogger(__name__)
diff --git a/tests/integrated/bgp/base_ip6.py b/tests/integrated/bgp/base_ip6.py
index 8d3ef41..be26faf 100644
--- a/tests/integrated/bgp/base_ip6.py
+++ b/tests/integrated/bgp/base_ip6.py
@@ -20,9 +20,9 @@ import logging
import sys
import unittest

-from tests.integrated.common import docker_base as ctn_base
-from tests.integrated.common import ryubgp
-from tests.integrated.common import quagga
+from ryu.tests.integrated.common import docker_base as ctn_base
+from ryu.tests.integrated.common import ryubgp
+from ryu.tests.integrated.common import quagga

LOG = logging.getLogger(__name__)
diff --git a/tests/integrated/bgp/test_basic.py b/tests/integrated/bgp/test_basic.py
index 9ef430c..5817d44 100644
--- a/tests/integrated/bgp/test_basic.py
+++ b/tests/integrated/bgp/test_basic.py
@@ -18,7 +18,8 @@ from __future__ import absolute_import

import time

-from tests.integrated.common import docker_base as ctn_base
+from ryu.tests.integrated.common import docker_base as ctn_base
+
from . import base

diff --git a/tests/integrated/bgp/test_ip6_basic.py b/tests/integrated/bgp/test_ip6_basic.py
index a92e4ed..40461a5 100644
--- a/tests/integrated/bgp/test_ip6_basic.py
+++ b/tests/integrated/bgp/test_ip6_basic.py
@@ -18,7 +18,8 @@ from __future__ import absolute_import

import time

-from tests.integrated.common import docker_base as ctn_base
+from ryu.tests.integrated.common import docker_base as ctn_base
+
from . import base_ip6 as base

--
2.7.4