Hi Kakuma-San, Sorry for the delay.
On 2016年11月29日 09:24, fumihiko kakuma wrote: > Hi Iwase-san, > > On Mon, 28 Nov 2016 14:05:48 +0900 > IWASE Yusuke <[email protected]> wrote: > >> Signed-off-by: IWASE Yusuke <[email protected]> >> --- >> .../common/install_docker_test_pkg_common.sh | 18 >> ++++++++++-------- >> .../common/install_docker_test_pkg_for_travis.sh | 1 - >> tools/test-requires | 4 +++- >> 3 files changed, 13 insertions(+), 10 deletions(-) >> >> diff --git a/ryu/tests/integrated/common/install_docker_test_pkg_common.sh >> b/ryu/tests/integrated/common/install_docker_test_pkg_common.sh >> index 08b059a..44a3e10 100644 >> --- a/ryu/tests/integrated/common/install_docker_test_pkg_common.sh >> +++ b/ryu/tests/integrated/common/install_docker_test_pkg_common.sh >> @@ -4,7 +4,6 @@ set -ex >> function init_variables { >> APTLINE_DOCKER=0 >> DIR_BASE=/tmp >> - SUDO_PIP="" >> } >> >> function process_options { >> @@ -21,17 +20,20 @@ function process_options { >> shift; ((i++)) >> DIR_BASE=$1 >> ;; >> - -s|--sudo-pip) >> - SUDO_PIP=sudo >> - ;; >> esac >> shift; ((i++)) >> done >> } >> >> +function install_pipework { >> + if ! which /usr/local/bin/pipework >/dev/null >> + then >> + sudo rm -rf $DIR_BASE/pipework >> + git clone https://github.com/jpetazzo/pipework.git >> $DIR_BASE/pipework >> + sudo install -m 0755 $DIR_BASE/pipework/pipework >> /usr/local/bin/pipework >> + fi >> +} >> + >> function install_depends_pkg { >> - sudo rm -rf $DIR_BASE/pipework >> - git clone https://github.com/jpetazzo/pipework.git $DIR_BASE/pipework >> - sudo install -m 0755 $DIR_BASE/pipework/pipework /usr/local/bin/pipework >> - $SUDO_PIP pip install pycrypto nsenter > > I want to install a minimal packages to avoid a package dependency trouble. > In a test in openstack I'm going to install only packages from > install_depends_pkg. So I wanted to leave this line. > > But I found that pycrypto and nsenter are unnecessary while I check > the scenario test tools. Currently we can remove these packages from > packages to be installed. Thank you for pointing out. You mean; "pycrypto" and "nsenter" are not required, we can remove them, right? I will post the updated patch to remove them. BTW, can we move "install_docker_test_pkg_for_travis.sh" into .travis.yml? Is it required in tox.ini for OpenStack project? Thanks, Iwase > > Thanks, > kakuma > >> + install_pipework >> } >> diff --git >> a/ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh >> b/ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh >> index 9128c77..d8c3b49 100644 >> --- a/ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh >> +++ b/ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh >> @@ -7,7 +7,6 @@ source ${RYU_PATH}/install_docker_test_pkg_common.sh >> >> init_variables >> process_options "$@" >> -SUDO_PIP="" >> >> sudo apt-get update >> install_depends_pkg >> diff --git a/tools/test-requires b/tools/test-requires >> index 9d59a70..8c28d90 100644 >> --- a/tools/test-requires >> +++ b/tools/test-requires >> @@ -1,6 +1,8 @@ >> coverage >> mock >> nose >> +nsenter # integrated tests (Docker) >> pep8 >> +pycrypto # integrated tests (Docker) >> pylint >> -formencode >> +formencode # unit tests (OF-Config) >> -- >> 2.7.4 >> >> >> ------------------------------------------------------------------------------ >> _______________________________________________ >> Ryu-devel mailing list >> [email protected] >> https://lists.sourceforge.net/lists/listinfo/ryu-devel > ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
