Merge pull request #688 from anarkiwi/master

Move Docker tests to python3.

Dockerfile.tests

@@ -12,17 +12,20 @@ RUN \
     iputils-ping \
     ladvd \
     libpython2.7-dev \
+    libpython3-dev \
     libyaml-dev \
     ndisc6 \
     net-tools \
     netcat-openbsd \
     psmisc \
     python-pip \
+    python3-pip \
     sudo \
     tcpdump \
     vlan \
     wpasupplicant
 
+
 RUN \
   git clone -b 2.2.2 https://github.com/mininet/mininet && \
   mininet/util/install.sh -nfv && \
@@ -33,8 +36,9 @@ COPY ./ /faucet-src/
 RUN \
   pip install --upgrade pip && \
   pip install setuptools wheel virtualenv --upgrade && \
-  pip install -r /faucet-src/requirements.txt \
-              -r /faucet-src/test-requirements.txt && \
-  pip install /faucet-src
+  pip install -r /faucet-src/test-requirements.txt && \
+  pip3 install setuptools wheel virtualenv --upgrade && \
+  pip3 install -r /faucet-src/requirements.txt && \
+  pip3 install /faucet-src
 
 CMD ["/faucet-src/docker/runtests.sh"]

tests/faucet_mininet_test_topo.py

@@ -165,7 +165,7 @@ def _command(self, env, tmpdir, name, args):
         for var, val in list(sorted(env.items())):
             env_vars.append('='.join((var, val)))
         script_wrapper.write(
-            'PYTHONPATH=..:../faucet %s exec ryu-manager %s $*\n' % (
+            'PYTHONPATH=.:..:../faucet %s exec ryu-manager %s $*\n' % (
                 ' '.join(env_vars), args))
         script_wrapper.close()
         return '/bin/sh %s' % script_wrapper_name

tests/test_api.py

@@ -7,7 +7,7 @@
 from ryu.controller.handler import set_ev_cls
 
 from faucet.faucet import EventFaucetAPIRegistered
-from faucet.faucet_api import FaucetAPI
+from faucet_api import FaucetAPI
 
 
 class TestFaucetAPI(app_manager.RyuApp):