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

Discussion:

IWASE Yusuke

2017-06-30 04:29:43 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>
---
{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

FUJITA Tomonori

2017-07-02 11:15:44 UTC

Permalink

I did a clean revert because I want to avoid experiments just before
the new release.

The current size is 1MB, right? Is it the problem?

On Fri, 30 Jun 2017 13:29:43 +0900

Post by IWASE Yusuke
This patch puts some test files back which seperated by the following
commit.
[Ryu-devel] [PATCH] tests: Separate test files from Ryu module
---
{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
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Iwase Yusuke

2017-07-03 01:40:39 UTC

Permalink

Hi Fujita-San,

Post by FUJITA Tomonori
I did a clean revert because I want to avoid experiments just before
the new release.
The current size is 1MB, right? Is it the problem?

No, the current size has no problem.

I just aimed to avoid the redundant files (e.g., .pcap, .json) which are
not needed for Ryu users and whose size will become larger if we add new
tests to cover non-tested modules.

FYI, as the current installed files size, "ryu/tests" modules amount to
19 MB of "ryu" module (29MB).
Most of these files are not widely used by Ryu users...

$ du -h -d 1 ryu
772K ryu/app
2.8M ryu/ofproto
16K ryu/contrib
3.2M ryu/lib
52K ryu/base
224K ryu/controller
2.4M ryu/services
128K ryu/topology
19M ryu/tests
88K ryu/cmd
32K ryu/__pycache__
29M ryu

Thanks,
Iwase

Post by FUJITA Tomonori
On Fri, 30 Jun 2017 13:29:43 +0900

IWAMOTO Toshihiro

2017-07-04 03:01:07 UTC

Permalink

At Mon, 3 Jul 2017 10:40:39 +0900,

Post by Iwase Yusuke
Hi Fujita-San,

Post by FUJITA Tomonori
I did a clean revert because I want to avoid experiments just before
the new release.
The current size is 1MB, right? Is it the problem?

How about keeping *.py files and just moving packet_data and jsons out
of ryu/tests?

Post by Iwase Yusuke
FYI, as the current installed files size, "ryu/tests" modules amount to
19 MB of "ryu" module (29MB).
Most of these files are not widely used by Ryu users...

Or, regenerating json files with separators=(',', ':') and indent=None
gives 7.5MB smaller json files.

Post by Iwase Yusuke
$ du -h -d 1 ryu
772K ryu/app
2.8M ryu/ofproto
16K ryu/contrib
3.2M ryu/lib
52K ryu/base
224K ryu/controller
2.4M ryu/services
128K ryu/topology
19M ryu/tests
88K ryu/cmd
32K ryu/__pycache__
29M ryu
Thanks,
Iwase

Post by FUJITA Tomonori
On Fri, 30 Jun 2017 13:29:43 +0900

Post by IWASE Yusuke
This patch puts some test files back which seperated by the following
commit.
[Ryu-devel] [PATCH] tests: Separate test files from Ryu module
---
{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
https://lists.sourceforge.net/lists/listinfo/ryu-devel

------------------------------------------------------------------------------
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
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Iwase Yusuke

2017-07-04 06:00:53 UTC

Permalink

Hi Iwamoto-San,

Thank you very much for your advise!

Post by IWAMOTO Toshihiro
At Mon, 3 Jul 2017 10:40:39 +0900,

Post by Iwase Yusuke
Hi Fujita-San,

Post by FUJITA Tomonori
I did a clean revert because I want to avoid experiments just before
the new release.
The current size is 1MB, right? Is it the problem?

How about keeping *.py files and just moving packet_data and jsons out
of ryu/tests?

In that case, some unit tests should be failed even if those tests are
included in Ryu module.
Mostly, that has no problem though.

Post by IWAMOTO Toshihiro

Post by Iwase Yusuke
FYI, as the current installed files size, "ryu/tests" modules amount to
19 MB of "ryu" module (29MB).
Most of these files are not widely used by Ryu users...

Or, regenerating json files with separators=(',', ':') and indent=None
gives 7.5MB smaller json files.

Post by FUJITA Tomonori
On Fri, 30 Jun 2017 13:29:43 +0900

Post by IWASE Yusuke
This patch puts some test files back which seperated by the following
commit.
[Ryu-devel] [PATCH] tests: Separate test files from Ryu module
---
{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
https://lists.sourceforge.net/lists/listinfo/ryu-devel