added .env file for vscode to find test/lib module

imcom · imcom · commit af3727152672 · 2020-08-31T17:58:01.000+08:00
replace `is not` exp in *_test.py files to suppress python syntax warning with py3
diff --git a/.env b/.env
@@ -0,0 +1 @@
+PYTHONPATH=./test
diff --git a/test/scenario_test/addpath_test.py b/test/scenario_test/addpath_test.py
@@ -269,7 +269,7 @@ def f():
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/aspath_test.py b/test/scenario_test/aspath_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -173,7 +172,7 @@ def f():
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/bgp_confederation_test.py b/test/scenario_test/bgp_confederation_test.py
@@ -14,8 +14,6 @@
 # limitations under the License.
 
 
-
-
 import sys
 import time
 import unittest
@@ -148,7 +146,7 @@ def test_03_best_path(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/bgp_malformed_msg_handling_test.py b/test/scenario_test/bgp_malformed_msg_handling_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -99,7 +98,7 @@ def test_03_treat_as_withdraw(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/bgp_router_test.py b/test/scenario_test/bgp_router_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import json
 import sys
 import time
@@ -472,7 +471,7 @@ def test_23_check_withdrawal3(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/bgp_unnumbered_test.py b/test/scenario_test/bgp_unnumbered_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import unittest
 from lib import base
 from lib.base import BGP_FSM_ESTABLISHED, local
@@ -47,6 +46,7 @@ def setUpClass(cls):
         time.sleep(initial_wait_time + 2)
 
         done = False
+
         def f(ifname, ctn):
             out = ctn.local('ip -6 n', capture=True)
             l = [line for line in out.split('\n') if ifname in line]
@@ -90,7 +90,7 @@ def test_02_add_ipv4_route(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/bgp_zebra_nht_test.py b/test/scenario_test/bgp_zebra_nht_test.py
@@ -284,7 +284,7 @@ def test_07_nexthop_restore(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/bgp_zebra_test.py b/test/scenario_test/bgp_zebra_test.py
@@ -303,7 +303,7 @@ def validate_nexthops(peers):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/evpn_test.py b/test/scenario_test/evpn_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 from itertools import combinations
 import sys
 import time
@@ -144,7 +143,7 @@ def test_04_check_mac_mobility_again(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/flow_spec_test.py b/test/scenario_test/flow_spec_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -409,7 +408,7 @@ def test_12_ipv6_gobgp_delete_route(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/global_policy_test.py b/test/scenario_test/global_policy_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -291,7 +290,7 @@ def test_18_reject_policy(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/graceful_restart_test.py b/test/scenario_test/graceful_restart_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -230,7 +229,7 @@ def test_11_multineighbor_graceful_restart(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/ibgp_router_test.py b/test/scenario_test/ibgp_router_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 from itertools import combinations
 import sys
 import time
@@ -292,7 +291,7 @@ def f3():
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/long_lived_graceful_restart_test.py b/test/scenario_test/long_lived_graceful_restart_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 from itertools import chain
 import sys
 import time
@@ -251,7 +250,7 @@ def test_08_llgr_restart_timer_expire(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/route_reflector_test.py b/test/scenario_test/route_reflector_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -139,7 +138,6 @@ def test_10_setup_rr_rtc_isolation_policy(self):
         # | (RR Client) |  | (RR Client) |  | (RR Client) |  | (RR Client) |
         # +-------------+  +-------------+  +-------------+  +-------------+
 
-
         gobgp_ctn_image_name = parser_option.gobgp_image
         rr = GoBGPContainer(name='rr', asn=65000, router_id='192.168.1.1',
                             ctn_image_name=gobgp_ctn_image_name,
@@ -260,7 +258,7 @@ def test_12_routes_from_separate_rts_peers_are_isolated_by_rr(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/route_server_as2_test.py b/test/scenario_test/route_server_as2_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import unittest
 import sys
 import time
@@ -110,7 +109,7 @@ def test_03_stop_q2_and_check_neighbor_status(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/route_server_ipv4_v6_test.py b/test/scenario_test/route_server_ipv4_v6_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -168,7 +167,7 @@ def test_08_check_rib(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/route_server_malformed_test.py b/test/scenario_test/route_server_malformed_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -543,7 +542,7 @@ def test(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/route_server_policy_grpc_test.py b/test/scenario_test/route_server_policy_grpc_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -2709,7 +2708,7 @@ def test(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/route_server_policy_test.py b/test/scenario_test/route_server_policy_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -3184,7 +3183,7 @@ def test(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/route_server_softreset_test.py b/test/scenario_test/route_server_softreset_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -135,7 +134,7 @@ def test_03_softresetin_test2(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/route_server_test.py b/test/scenario_test/route_server_test.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -250,7 +249,7 @@ def check_nexthop(target_prefix, expected_nexthop):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/route_server_test2.py b/test/scenario_test/route_server_test2.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 
-
 import sys
 import time
 import unittest
@@ -101,7 +100,7 @@ def test_04_withdraw_path(self):
 
 if __name__ == '__main__':
     output = local("which docker 2>&1 > /dev/null ; echo $?", capture=True)
-    if int(output) is not 0:
+    if int(output) != 0:
         print("docker not found")
         sys.exit(1)
 
diff --git a/test/scenario_test/rtc_test.py b/test/scenario_test/rtc_test.py
diff --git a/test/scenario_test/vrf_neighbor_test.py b/test/scenario_test/vrf_neighbor_test.py
diff --git a/test/scenario_test/vrf_neighbor_test2.py b/test/scenario_test/vrf_neighbor_test2.py
diff --git a/test/scenario_test/zapi_v3_multipath_test.py b/test/scenario_test/zapi_v3_multipath_test.py
diff --git a/test/scenario_test/zapi_v3_test.py b/test/scenario_test/zapi_v3_test.py
