From 6ab96815e8a10900ca1d7ddff771ed588a729984 Mon Sep 17 00:00:00 2001 From: Zuul Date: Wed, 10 Apr 2019 16:24:48 +0000 Subject: [PATCH] Update git submodules * Update os-ken from branch 'master' - Merge "Fix import for oskenbgp" - Fix import for oskenbgp Running the tests in distro build env fails currently with: Failed to import test module: os_ken.tests.integrated.bgp.test_ip6_basic Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/unittest2/loader.py", line 456, in _find_test_path module = self._get_module_from_name(name) File "/usr/lib/python2.7/site-packages/unittest2/loader.py", line 395, in _get_module_from_name __import__(name) File "os_ken/tests/integrated/bgp/test_ip6_basic.py", line 22, in from . import base_ip6 as base File "os_ken/tests/integrated/bgp/base_ip6.py", line 24, in from os_ken.tests.integrated.common import os_kenbgp ImportError: cannot import name os_kenbgp The filename is os_ken/tests/integrated/common/oskenbgp.py so import the correct module. Story: 2005392 Task: 30381 Change-Id: Ie10da6df1a13e19d0ba20b4fa2c4c61125152f58 --- os-ken | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os-ken b/os-ken index 408d1ec85c..6a4b167cea 160000 --- a/os-ken +++ b/os-ken @@ -1 +1 @@ -Subproject commit 408d1ec85c9a5bab4ae0a0d641187d6d34b85a9a +Subproject commit 6a4b167cea4f09cc5d3e346be909d21f97e381f5