summaryrefslogtreecommitdiffhomepage
path: root/test/lib/base.py
diff options
context:
space:
mode:
authorISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>2017-02-03 08:21:33 +0000
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2017-02-09 14:59:03 +0900
commit3703916e558624e383794b015b8f8e69422654c1 (patch)
tree9308b0526bc1285d0646e8cedb411911a1d1f6c6 /test/lib/base.py
parent7aff4a6c5841b2ec39ff4c96e8b654f78c7026d8 (diff)
server: fix in-policy bug
When a path is rejected by in-policy, the prefix must be withdrawn since it might already exist in the rib. Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Diffstat (limited to 'test/lib/base.py')
-rw-r--r--test/lib/base.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/lib/base.py b/test/lib/base.py
index 10b50b46..8e2c5f22 100644
--- a/test/lib/base.py
+++ b/test/lib/base.py
@@ -17,8 +17,10 @@ from fabric.api import local, lcd
from fabric import colors
from fabric.utils import indent
from fabric.state import env, output
-from docker import Client
-
+try:
+ from docker import Client
+except ImportError:
+ from docker import APIClient as Client
import netaddr
import os
import time