From 25a9ba6d38b1f6d8c17ea79480c12282997a3339 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 13 Oct 2014 14:06:45 +0200 Subject: [PATCH] Fix tests and drop Python 2.6 support --- .travis.yml | 1 - README.rst | 2 +- ironic_discoverd/test.py | 2 +- tox.ini | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7f5f6160..10e1bba17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: python python: 2.7 env: - TOX_ENV=py27 - - TOX_ENV=py26 - TOX_ENV=py33 - TOX_ENV=flake8 install: diff --git a/README.rst b/README.rst index 1307d14a2..4dd8529d0 100644 --- a/README.rst +++ b/README.rst @@ -95,7 +95,7 @@ Next checkout and create environments:: tox Repeat *tox* command each time you need to run tests. If you don't have Python -interpreter of one of supported versions (currently 2.6, 2.7 and 3.3), use +interpreter of one of supported versions (currently 2.7 and 3.3), use ``-e`` flag to select only some environments, e.g. :: diff --git a/ironic_discoverd/test.py b/ironic_discoverd/test.py index ee6812703..5148fcaab 100644 --- a/ironic_discoverd/test.py +++ b/ironic_discoverd/test.py @@ -146,7 +146,7 @@ class TestClient(unittest.TestCase): client.discover(['uuid1', 'uuid2'], auth_token="token") mock_post.assert_called_once_with( - "http://127.0.0.1:5000/v1/discover", + "http://127.0.0.1:5050/v1/discover", data='["uuid1", "uuid2"]', headers={'Content-Type': 'application/json', 'X-Auth-Token': 'token'} diff --git a/tox.ini b/tox.ini index c5873f02c..d4bd2faf6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,py33,flake8 +envlist = py27,py33,flake8 [testenv] usedevelop = True @@ -15,4 +15,4 @@ deps = -rrequirements.txt flake8 commands = - flake8 ironic_discoverd + flake8 ironic_discoverd