Merge "Targets tests: Clean up long lines"

diff --cc cinder/tests/unit/targets/test_cxt_driver.py
index 6a7034e764b9603c7f8d040e6cd276c7123b0b65,9a844ec3ecd300d9ea87fe05151d2fb6b466a954..49c79edd04e4004149f2f9a658eb9df59335edd7
--- 1/cinder/tests/unit/targets/test_cxt_driver.py
--- 2/cinder/tests/unit/targets/test_cxt_driver.py
+++ b/cinder/tests/unit/targets/test_cxt_driver.py
@@@ -50,11 -56,11 +56,11 @@@ class TestCxtAdmDriver(tf.TargetDriverF
              self.assertTrue(m_exec.called)
  
      def test_get_target_chap_auth(self):
 -        tmp_file = StringIO.StringIO()
 +        tmp_file = six.StringIO()
          tmp_file.write(
              'target:\n'
-             '        TargetName=iqn.2010-10.org.openstack:volume-83c2e877-feed-46be-8435-77884fe55b45\n'  # noqa
-             '        TargetDevice=/dev/stack-volumes-lvmdriver-1/volume-83c2e877-feed-46be-8435-77884fe55b45\n'  # noqa
+             '        TargetName=iqn.2010-10.org.openstack:volume-%(id)s\n'
+             '        TargetDevice=/dev/%(vg)s/volume-%(id)s\n'
              '        PortalGroup=1@10.9.8.7:3260\n'
              '        AuthMethod=CHAP\n'
              '        Auth_CHAP_Policy=Oneway\n'