summaryrefslogtreecommitdiff
path: root/tests/unittests/test__init__.py
diff options
context:
space:
mode:
authorharlowja <harlowja@virtualbox.rhel>2013-02-23 21:23:24 -0800
committerharlowja <harlowja@virtualbox.rhel>2013-02-23 21:23:24 -0800
commiteacfc7ffbec3e6a0348ed484da895e2d2fc5ba10 (patch)
treee63c8f74a34c6250764136865c542af6ba78d989 /tests/unittests/test__init__.py
parent46a7a39775ed8f745ec8b63a9563f3ae6337d845 (diff)
downloadvyos-cloud-init-eacfc7ffbec3e6a0348ed484da895e2d2fc5ba10.tar.gz
vyos-cloud-init-eacfc7ffbec3e6a0348ed484da895e2d2fc5ba10.zip
Get tests working and further adjustments.
Diffstat (limited to 'tests/unittests/test__init__.py')
-rw-r--r--tests/unittests/test__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/unittests/test__init__.py b/tests/unittests/test__init__.py
index ac082076..d707afa9 100644
--- a/tests/unittests/test__init__.py
+++ b/tests/unittests/test__init__.py
@@ -191,8 +191,8 @@ class TestCmdlineUrl(MockerTestCase):
mock_readurl = self.mocker.replace(url_helper.readurl,
passthrough=False)
- mock_readurl(url)
- self.mocker.result(url_helper.UrlResponse(200, payload))
+ mock_readurl(url, ARGS, KWARGS)
+ self.mocker.result(util.StringResponse(payload))
self.mocker.replay()
self.assertEqual((key, url, None),
@@ -207,8 +207,8 @@ class TestCmdlineUrl(MockerTestCase):
mock_readurl = self.mocker.replace(url_helper.readurl,
passthrough=False)
- mock_readurl(url)
- self.mocker.result(url_helper.UrlResponse(200, payload))
+ mock_readurl(url, ARGS, KWARGS)
+ self.mocker.result(util.StringResponse(payload))
self.mocker.replay()
self.assertEqual((key, url, payload),
@@ -221,7 +221,7 @@ class TestCmdlineUrl(MockerTestCase):
cmdline = "ro %s=%s bar=1" % (key, url)
self.mocker.replace(url_helper.readurl, passthrough=False)
- self.mocker.result(url_helper.UrlResponse(400))
+ self.mocker.result(util.StringResponse(""))
self.mocker.replay()
self.assertEqual((None, None, None),