From 9609f9a5a4776671f571f765a179506d26df56da Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 18 Apr 2017 13:36:44 -0300 Subject: [PATCH] 11502: Avoid races on test by getting the unstripped manifest version before the comparison. --- sdk/python/tests/test_arv_get.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sdk/python/tests/test_arv_get.py b/sdk/python/tests/test_arv_get.py index 4feac0fd61..afbe634b12 100644 --- a/sdk/python/tests/test_arv_get.py +++ b/sdk/python/tests/test_arv_get.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- import io +import os import shutil import tempfile @@ -80,13 +81,18 @@ class ArvadosGetTestCase(run_test_server.TestCaseWithServers): # Get the collection manifest by UUID r = self.run_get([self.col_loc, self.tempdir]) self.assertEqual(0, r) - with open("{}/{}".format(self.tempdir, self.col_loc), "r") as f: - self.assertEqual(self.col_manifest, f.read()) + m_from_collection = collection.Collection(self.col_manifest).manifest_text(strip=True) + with open(os.path.join(self.tempdir, self.col_loc), "r") as f: + # Strip manifest before comparison to avoid races + m_from_file = collection.Collection(f.read()).manifest_text(strip=True) + self.assertEqual(m_from_collection, m_from_file) # Get the collection manifest by PDH r = self.run_get([self.col_pdh, self.tempdir]) self.assertEqual(0, r) - with open("{}/{}".format(self.tempdir, self.col_pdh), "r") as f: - self.assertEqual(self.col_manifest, f.read()) + with open(os.path.join(self.tempdir, self.col_pdh), "r") as f: + # Strip manifest before comparison to avoid races + m_from_file = collection.Collection(f.read()).manifest_text(strip=True) + self.assertEqual(m_from_collection, m_from_file) def test_get_collection_stripped_manifest(self): col_loc, col_pdh, col_manifest = self.write_test_collection(strip_manifest=True) -- 2.30.2