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 <iwase.yusu...@gmail.com>
---
{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/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 ++-
9 files changed, 10 insertions(+), 8 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/quagga.py (100%)
rename {tests => ryu/tests}/integrated/common/ryubgp.py (100%)
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/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
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Ryu-devel mailing list
Ryu-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ryu-devel
