From 327ed78965756b96fa1fe24967ec87cb9e84472e Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <lzyeval@gmail.com>
Date: Mon, 6 Feb 2012 09:50:06 +0800
Subject: [PATCH] Backslash continuations (nova.tests)
Fixes bug #925285
Backslash continuations removal for package nova.tests
Change-Id: I089dfb9a06a807e58ebb21329800a4eff40ed2bb
---
nova/tests/baremetal/test_proxy_bare_metal.py | 18 +++----
nova/tests/baremetal/test_tilera.py | 51 ++++++++++---------
2 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py
index 580f898635..0ea7462272 100644
--- a/nova/tests/baremetal/test_proxy_bare_metal.py
+++ b/nova/tests/baremetal/test_proxy_bare_metal.py
@@ -95,9 +95,9 @@ class DomainReadWriteTestCase(test.TestCase):
self.mox.StubOutWithMock(__builtin__, 'open')
try:
- open('/tftpboot/test_fake_dom_file', 'r').AndRaise(\
- IOError(2, 'No such file or directory',
- '/tftpboot/test_fake_dom_file'))
+ open('/tftpboot/test_fake_dom_file',
+ 'r').AndRaise(IOError(2, 'No such file or directory',
+ '/tftpboot/test_fake_dom_file'))
self.mox.ReplayAll()
@@ -128,8 +128,8 @@ class DomainReadWriteTestCase(test.TestCase):
# Python object as expected_json
# We can't do an exact string comparison
# because of ordering and whitespace
- mock_file.write(mox.Func(functools.partial(self.assertJSONEquals,\
- expected_json)))
+ mock_file.write(mox.Func(functools.partial(self.assertJSONEquals,
+ expected_json)))
mock_file.close()
self.mox.ReplayAll()
@@ -236,8 +236,8 @@ class BareMetalDomTestCase(test.TestCase):
self.mox.StubOutWithMock(dom, 'write_domains')
# Expected calls
- dom.read_domains('/tftpboot/test_fake_dom_file')\
- .AndReturn(fake_domains)
+ dom.read_domains('/tftpboot/'
+ 'test_fake_dom_file').AndReturn(fake_domains)
dom.write_domains('/tftpboot/test_fake_dom_file', fake_domains)
self.mox.ReplayAll()
@@ -274,8 +274,8 @@ class ProxyBareMetalTestCase(test.TestCase):
self.mox.StubOutWithMock(dom, 'write_domains')
# Expected calls
- dom.read_domains('/tftpboot/test_fake_dom_file')\
- .AndReturn(fake_domains)
+ dom.read_domains('/tftpboot/'
+ 'test_fake_dom_file').AndReturn(fake_domains)
dom.write_domains('/tftpboot/test_fake_dom_file', fake_domains)
self.mox.ReplayAll()
diff --git a/nova/tests/baremetal/test_tilera.py b/nova/tests/baremetal/test_tilera.py
index 7b58282e18..e98ade869e 100644
--- a/nova/tests/baremetal/test_tilera.py
+++ b/nova/tests/baremetal/test_tilera.py
@@ -26,26 +26,29 @@ class TileraBareMetalNodesTestCase(test.TestCase):
def setUp(self):
super(TileraBareMetalNodesTestCase, self).setUp()
- self.board_info = """\
-# board_id ip_address mac_address 00:1A:CA:00:57:90 \
-00:1A:CA:00:58:98 00:1A:CA:00:58:50
-6 10.0.2.7 00:1A:CA:00:58:5C 10 16218 917 476 1 tilera_hv 1 \
-{"vendor":"tilera","model":"TILEmpower","arch":"TILEPro64","features":\
-["8x8Grid","32bVLIW","5.6MBCache","443BOPS","37TbMesh","700MHz-866MHz",\
-"4DDR2","2XAUIMAC/PHY","2GbEMAC"],"topology":{"cores":"64"}}
-7 10.0.2.8 00:1A:CA:00:58:A4 10 16218 917 476 1 tilera_hv 1 \
-{"vendor":"tilera","model":"TILEmpower","arch":"TILEPro64","features":\
-["8x8Grid","32bVLIW","5.6MBCache","443BOPS","37TbMesh","700MHz-866MHz",\
-"4DDR2","2XAUIMAC/PHY","2GbEMAC"],"topology":{"cores":"64"}}
-8 10.0.2.9 00:1A:CA:00:58:1A 10 16218 917 476 1 tilera_hv 1 \
-{"vendor":"tilera","model":"TILEmpower","arch":"TILEPro64","features":\
-["8x8Grid","32bVLIW","5.6MBCache","443BOPS","37TbMesh","700MHz-866MHz",\
-"4DDR2","2XAUIMAC/PHY","2GbEMAC"],"topology":{"cores":"64"}}
-9 10.0.2.10 00:1A:CA:00:58:38 10 16385 1000 0 0 tilera_hv 1 \
-{"vendor":"tilera","model":"TILEmpower","arch":"TILEPro64","features":\
-["8x8Grid","32bVLIW","5.6MBCache","443BOPS","37TbMesh","700MHz-866MHz",\
-"4DDR2","2XAUIMAC/PHY","2GbEMAC"],"topology":{"cores":"64"}}
-"""
+ self.board_info = "\n".join([
+'# board_id ip_address mac_address 00:1A:CA:00:57:90 '
+'00:1A:CA:00:58:98 00:1A:CA:00:58:50',
+'6 10.0.2.7 00:1A:CA:00:58:5C 10 16218 917 476 1 tilera_hv 1 '
+'{"vendor":"tilera","model":"TILEmpower","arch":"TILEPro64",'
+ '"features":["8x8Grid","32bVLIW","5.6MBCache","443BOPS","37TbMesh",'
+ '"700MHz-866MHz","4DDR2","2XAUIMAC/PHY","2GbEMAC"],'
+ '"topology":{"cores":"64"}}',
+'7 10.0.2.8 00:1A:CA:00:58:A4 10 16218 917 476 1 tilera_hv 1 '
+'{"vendor":"tilera","model":"TILEmpower","arch":"TILEPro64",'
+ '"features":["8x8Grid","32bVLIW","5.6MBCache","443BOPS","37TbMesh",'
+ '"700MHz-866MHz","4DDR2","2XAUIMAC/PHY","2GbEMAC"],'
+ '"topology":{"cores":"64"}}',
+'8 10.0.2.9 00:1A:CA:00:58:1A 10 16218 917 476 1 tilera_hv 1 '
+'{"vendor":"tilera","model":"TILEmpower","arch":"TILEPro64",'
+ '"features":["8x8Grid","32bVLIW","5.6MBCache","443BOPS","37TbMesh",'
+ '"700MHz-866MHz","4DDR2","2XAUIMAC/PHY","2GbEMAC"],'
+ '"topology":{"cores":"64"}}',
+'9 10.0.2.10 00:1A:CA:00:58:38 10 16385 1000 0 0 tilera_hv 1 '
+'{"vendor":"tilera","model":"TILEmpower","arch":"TILEPro64",'
+ '"features":["8x8Grid","32bVLIW","5.6MBCache","443BOPS","37TbMesh",'
+ '"700MHz-866MHz","4DDR2","2XAUIMAC/PHY","2GbEMAC"],'
+ '"topology":{"cores":"64"}}'])
def tearDown(self):
super(TileraBareMetalNodesTestCase, self).tearDown()
@@ -63,8 +66,8 @@ class TileraBareMetalNodesTestCase(test.TestCase):
try:
self.mox.StubOutWithMock(__builtin__, 'open')
- open("/tftpboot/tilera_boards", "r").AndReturn(\
- StringIO.StringIO(self.board_info))
+ open("/tftpboot/tilera_boards",
+ "r").AndReturn(StringIO.StringIO(self.board_info))
self.mox.ReplayAll()
@@ -78,8 +81,8 @@ class TileraBareMetalNodesTestCase(test.TestCase):
self.mox.StubOutWithMock(__builtin__, 'open')
- open("/tftpboot/tilera_boards", "r").AndReturn(\
- StringIO.StringIO(self.board_info))
+ open("/tftpboot/tilera_boards",
+ "r").AndReturn(StringIO.StringIO(self.board_info))
self.mox.ReplayAll()
nodes = tilera.BareMetalNodes()