Simplify test_updater_root_rotation_integration

Implement a simpler check that the file we expected to fail wasa the
cause of the NoWorkingMirror exceptions.

Signed-off-by: Joshua Lock <[email protected]>

Author: joshuagl

tests/test_updater_root_rotation_integration.py

@@ -266,13 +266,10 @@ def test_verify_root_with_current_keyids_and_threshold(self):
        self.repository_updater.refresh()
 
      for mirror_url, mirror_error in six.iteritems(cm.exception.mirror_errors):
-       url_prefix = self.repository_mirrors['mirror1']['url_prefix']
-       url_file = os.path.join(url_prefix, 'metadata', '2.root.json')
-
        # Verify that '2.root.json' is the culprit.
-       self.assertEqual(url_file.replace('\\', '/'), mirror_url)
+       self.assertTrue(mirror_url.endswith('/2.root.json'))
        self.assertTrue(isinstance(mirror_error,
-          securesystemslib.exceptions.BadSignatureError))
+           securesystemslib.exceptions.BadSignatureError))
 
      # Assert that the current 'root.json' on the client side is the verified one
      self.assertTrue(filecmp.cmp(
@@ -412,11 +409,8 @@ def test_root_rotation_missing_keys(self):
       self.repository_updater.refresh()
 
     for mirror_url, mirror_error in six.iteritems(cm.exception.mirror_errors):
-      url_prefix = self.repository_mirrors['mirror1']['url_prefix']
-      url_file = os.path.join(url_prefix, 'metadata', '2.root.json')
-
       # Verify that '2.root.json' is the culprit.
-      self.assertEqual(url_file.replace('\\', '/'), mirror_url)
+      self.assertTrue(mirror_url.endswith('/2.root.json'))
       self.assertTrue(isinstance(mirror_error,
           securesystemslib.exceptions.BadSignatureError))
 
@@ -491,13 +485,10 @@ def test_root_rotation_unmet_last_version_threshold(self):
       self.repository_updater.refresh()
 
     for mirror_url, mirror_error in six.iteritems(cm.exception.mirror_errors):
-      url_prefix = self.repository_mirrors['mirror1']['url_prefix']
-      url_file = os.path.join(url_prefix, 'metadata', '3.root.json')
-
       # Verify that '2.root.json' is the culprit.
-      self.assertEqual(url_file.replace('\\', '/'), mirror_url)
+      self.assertTrue(mirror_url.endswith('/3.root.json'))
       self.assertTrue(isinstance(mirror_error,
-        securesystemslib.exceptions.BadSignatureError))
+          securesystemslib.exceptions.BadSignatureError))
 
     # Assert that the current 'root.json' on the client side is the verified one
     self.assertTrue(filecmp.cmp(
@@ -541,13 +532,10 @@ def test_root_rotation_unmet_new_threshold(self):
       self.repository_updater.refresh()
 
     for mirror_url, mirror_error in six.iteritems(cm.exception.mirror_errors):
-      url_prefix = self.repository_mirrors['mirror1']['url_prefix']
-      url_file = os.path.join(url_prefix, 'metadata', '3.root.json')
-
       # Verify that '2.root.json' is the culprit.
-      self.assertEqual(url_file.replace('\\', '/'), mirror_url)
+      self.assertTrue(mirror_url.endswith('/3.root.json'))
       self.assertTrue(isinstance(mirror_error,
-        securesystemslib.exceptions.BadSignatureError))
+          securesystemslib.exceptions.BadSignatureError))
 
     # Assert that the current 'root.json' on the client side is the verified one
     self.assertTrue(filecmp.cmp(
@@ -580,13 +568,10 @@ def test_root_rotation_discard_untrusted_version(self):
       self.repository_updater.refresh()
 
     for mirror_url, mirror_error in six.iteritems(cm.exception.mirror_errors):
-      url_prefix = self.repository_mirrors['mirror1']['url_prefix']
-      url_file = os.path.join(url_prefix, 'metadata', '2.root.json')
-
       # Verify that '2.root.json' is the culprit.
-      self.assertEqual(url_file.replace('\\', '/'), mirror_url)
+      self.assertTrue(mirror_url.endswith('/2.root.json'))
       self.assertTrue(isinstance(mirror_error,
-        securesystemslib.exceptions.BadSignatureError))
+          securesystemslib.exceptions.BadSignatureError))
 
     # Assert that the current 'root.json' on the client side is the trusted one
     # and 2.root.json is discarded