Revert "tests: Separate test files from Ryu module"

This reverts commit a67ed28.

The commit breaks OpenStack neutron dynamic routing.

.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

CONTRIBUTING.rst

@@ -87,7 +87,7 @@ Coding style guide
 
 * JSON files:
 
-  Ryu source tree has JSON files under tests/unit/ofproto/json.
+  Ryu source tree has JSON files under ryu/tests/unit/ofproto/json.
   They are used by unit tests.  To make patches easier to read,
   they are normalized using tools/normalize_json.py.  Please re-run
   the script before committing changes to these JSON files.

MANIFEST.in

@@ -6,7 +6,8 @@ graft doc
 graft etc
 graft tools
 recursive-exclude doc/build *
-recursive-exclude tests/*
+recursive-exclude ryu/tests/packet_data_generator *
+recursive-exclude ryu/tests/packet_data_generator2 *
 global-exclude *~
 global-exclude *.pyc
 global-exclude .gitignore

doc/source/ofproto_v1_0_ref.rst

@@ -14,13 +14,13 @@ Handshake
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-5-features_request.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-5-features_request.packet.json
 
 .. autoclass:: OFPSwitchFeatures
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-6-ofp_switch_features.packet.json
 
 Switch Configuration
 --------------------
@@ -29,19 +29,19 @@ Switch Configuration
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-7-ofp_set_config.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-7-ofp_set_config.packet.json
 
 .. autoclass:: OFPGetConfigRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-8-ofp_get_config_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-8-ofp_get_config_request.packet.json
 
 .. autoclass:: OFPGetConfigReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-9-ofp_get_config_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-9-ofp_get_config_reply.packet.json
 
 Modify State Messages
 ---------------------
@@ -50,14 +50,14 @@ Modify State Messages
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-3-ofp_flow_mod.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-2-ofp_flow_mod.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-3-ofp_flow_mod.packet.json
 
 .. autoclass:: OFPPortMod
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-22-ofp_port_mod.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-22-ofp_port_mod.packet.json
 
 Queue Configuration Messages
 ----------------------------
@@ -66,13 +66,13 @@ Queue Configuration Messages
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-35-ofp_queue_get_config_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-35-ofp_queue_get_config_request.packet.json
 
 .. autoclass:: OFPQueueGetConfigReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-36-ofp_queue_get_config_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-36-ofp_queue_get_config_reply.packet.json
 
 Read State Messages
 -------------------
@@ -81,74 +81,74 @@ Read State Messages
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-24-ofp_desc_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-24-ofp_desc_stats_request.packet.json
 
 .. autoclass:: OFPDescStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-0-ofp_desc_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-0-ofp_desc_stats_reply.packet.json
 
 .. autoclass:: OFPFlowStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-11-ofp_flow_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-11-ofp_flow_stats_request.packet.json
 
 .. autoclass:: OFPFlowStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-12-ofp_flow_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-12-ofp_flow_stats_reply.packet.json
 
 .. autoclass:: OFPAggregateStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-25-ofp_aggregate_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-25-ofp_aggregate_stats_request.packet.json
 
 .. autoclass:: OFPAggregateStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-26-ofp_aggregate_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-26-ofp_aggregate_stats_reply.packet.json
 
 .. autoclass:: OFPTableStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-27-ofp_table_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-27-ofp_table_stats_request.packet.json
 
 .. autoclass:: OFPTableStatsReply
 
 ..    XXX commented out because it's too long
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-28-ofp_table_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-28-ofp_table_stats_reply.packet.json
 
 .. autoclass:: OFPPortStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-29-ofp_port_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-29-ofp_port_stats_request.packet.json
 
 .. autoclass:: OFPPortStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-30-ofp_port_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-30-ofp_port_stats_reply.packet.json
 
 .. autoclass:: OFPQueueStatsRequest
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-37-ofp_queue_stats_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-37-ofp_queue_stats_request.packet.json
 
 .. autoclass:: OFPQueueStatsReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-38-ofp_queue_stats_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-38-ofp_queue_stats_reply.packet.json
 
 .. autoclass:: OFPVendorStatsRequest
 .. autoclass:: OFPVendorStatsReply
@@ -160,7 +160,7 @@ Send Packet Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-1-ofp_packet_out.packet.json
 
 Barrier Message
 ---------------
@@ -169,13 +169,13 @@ Barrier Message
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-17-ofp_barrier_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-17-ofp_barrier_request.packet.json
 
 .. autoclass:: OFPBarrierReply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-18-ofp_barrier_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-18-ofp_barrier_reply.packet.json
 
 
 Asynchronous Messages
@@ -188,7 +188,7 @@ Packet-In Message
 
     JSON Example:
 
-    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json
+    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-4-ofp_packet_in.packet.json
 
 Flow Removed Message
 --------------------
@@ -197,7 +197,7 @@ Flow Removed Message
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-40-ofp_flow_removed.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-40-ofp_flow_removed.packet.json
 
 Port Status Message
 -------------------
@@ -206,7 +206,7 @@ Port Status Message
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-39-ofp_port_status.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-39-ofp_port_status.packet.json
 
 Error Message
 -------------
@@ -215,8 +215,8 @@ Error Message
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-15-ofp_error_msg.packet.json
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-41-ofp_error_msg_vendor.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-15-ofp_error_msg.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-41-ofp_error_msg_vendor.packet.json
 
 Symmetric Messages
 ==================
@@ -228,7 +228,7 @@ Hello
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-10-ofp_hello.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-10-ofp_hello.packet.json
 
 Echo Request
 ------------
@@ -237,7 +237,7 @@ Echo Request
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-13-ofp_echo_request.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-13-ofp_echo_request.packet.json
 
 
 Echo Reply
@@ -247,7 +247,7 @@ Echo Reply
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-14-ofp_echo_reply.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-14-ofp_echo_reply.packet.json
 
 
 Vendor
@@ -257,7 +257,7 @@ Vendor
 
 ..    JSON Example:
 ..
-..    .. literalinclude:: ../../tests/unit/ofproto/json/of10/1-16-ofp_vendor.packet.json
+..    .. literalinclude:: ../../ryu/tests/unit/ofproto/json/of10/1-16-ofp_vendor.packet.json
 
 Port Structures
 ===============