From 7472fa153451cc464eb9b677179214429142aacf Mon Sep 17 00:00:00 2001 From: Dave King Date: Sun, 24 Mar 2013 09:23:12 -0400 Subject: [PATCH 1/2] Build with 2.6 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d876a93..e19d1d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python python: -# - "2.6" + - "2.6" - "2.7" # - "3.2" # command to install dependencies From f3e530ce1617941f0a3f9925a60c562787d2aed5 Mon Sep 17 00:00:00 2001 From: Dave King Date: Sun, 24 Mar 2013 09:32:52 -0400 Subject: [PATCH 2/2] Updates to run under Python 2.6. --- requirements.txt | 3 +++ test/test_runner.py | 35 ++++++++++++++++------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/requirements.txt b/requirements.txt index 73a4d9c..ab681a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,5 @@ +nose==1.2.1 +unittest2==0.5.1 +mock==1.0.1 apache-libcloud>=0.11.4 littlechef==1.5.1 diff --git a/test/test_runner.py b/test/test_runner.py index 9953d85..149c8a1 100644 --- a/test/test_runner.py +++ b/test/test_runner.py @@ -1,4 +1,4 @@ -import unittest +import unittest2 as unittest import mock from littlechef_rackspace.api import Regions, RackspaceApi from littlechef_rackspace.commands import RackspaceCreate, RackspaceListImages @@ -49,12 +49,11 @@ def test_must_specify_existing_command(self): def test_list_images_fails_if_configuration_is_not_provided(self): with mock.patch.multiple("littlechef_rackspace.runner", RackspaceApi=self.api_class, ChefDeployer=self.deploy_class, RackspaceListImages=self.list_images_class, - abort=self.abort), \ - self.assertRaises(AbortException): - - r = Runner(options={}) - r.main(["list-images"]) - self.abort.assert_any_call(FailureMessages.NEED_API_KEY) + abort=self.abort): + with self.assertRaises(AbortException): + r = Runner(options={}) + r.main(["list-images"]) + self.abort.assert_any_call(FailureMessages.NEED_API_KEY) def test_list_images_instantiates_api(self): with mock.patch.multiple("littlechef_rackspace.runner", RackspaceApi=self.api_class, @@ -77,21 +76,19 @@ def test_uses_config_settings(self): def test_create_fails_if_configuration_is_not_provided(self): r = Runner(options={}) - with mock.patch.multiple('littlechef_rackspace.runner', abort=self.abort),\ - self.assertRaises(AbortException): - - r.main(["create"]) - self.abort.assert_any_call(FailureMessages.NEED_API_KEY) + with mock.patch.multiple('littlechef_rackspace.runner', abort=self.abort): + with self.assertRaises(AbortException): + r.main(["create"]) + self.abort.assert_any_call(FailureMessages.NEED_API_KEY) def test_create_fails_if_required_arguments_are_not_provided(self): - with mock.patch.multiple('littlechef_rackspace.runner', abort=self.abort),\ - self.assertRaises(AbortException): - - self.create_command.validate_args.return_value = False - r = Runner(options={}) - r.main("create --username username --key deadbeef --region dfw".split(" ")) - self.abort.assert_any_call(FailureMessages.MISSING_REQUIRED_ARGUMENTS) + with mock.patch.multiple('littlechef_rackspace.runner', abort=self.abort): + with self.assertRaises(AbortException): + self.create_command.validate_args.return_value = False + r = Runner(options={}) + r.main("create --username username --key deadbeef --region dfw".split(" ")) + self.abort.assert_any_call(FailureMessages.MISSING_REQUIRED_ARGUMENTS) def test_create_instantiates_api_and_deploy_with_default_private_key(self): with mock.patch.multiple("littlechef_rackspace.runner", RackspaceApi=self.api_class,