From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 25 Aug 2014 13:14:01 +0000 (-0400)
Subject: fix assertions so non-deterministic writes can be asserted
X-Git-Tag: v1.5.12~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a34d786b91b059ae9a2f86bd6be2cf8b5a3d3f82;p=ceph-deploy.git

fix assertions so non-deterministic writes can be asserted

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/tests/unit/test_mon.py b/ceph_deploy/tests/unit/test_mon.py
index 871d7e0..0cfccba 100644
--- a/ceph_deploy/tests/unit/test_mon.py
+++ b/ceph_deploy/tests/unit/test_mon.py
@@ -199,17 +199,13 @@ class TestConcatenateKeyrings(object):
         self.make_keyring(tmpdir, 'bar.keyring', '[mon.2]\nkey = value\n')
         self.make_keyring(tmpdir, 'fez.keyring', '[mon.3]\nkey = value\n')
         self.args.keyrings = tmpdir.strpath
-        expected = '\n'.join([
-            '[mon.2]',
-            'key = value',
-            '[mon.3]',
-            'key = value',
-            '[mon.1]',
-            'key = value',
-            '',
-        ])
-
-        assert mon.concatenate_keyrings(self.args) == expected
+        result = mon.concatenate_keyrings(self.args).split('\n')
+        assert '[mon.2]' in result
+        assert 'key = value' in result
+        assert '[mon.3]' in result
+        assert 'key = value' in result
+        assert '[mon.1]' in result
+        assert 'key = value' in result
 
     def test_skips_duplicate_content(self, tmpdir):
         self.make_keyring(tmpdir, 'foo.keyring', '[mon.1]\nkey = value\n')
@@ -217,17 +213,10 @@ class TestConcatenateKeyrings(object):
         self.make_keyring(tmpdir, 'fez.keyring', '[mon.3]\nkey = value\n')
         self.make_keyring(tmpdir, 'dupe.keyring', '[mon.3]\nkey = value\n')
         self.args.keyrings = tmpdir.strpath
-        expected = '\n'.join([
-            '[mon.2]',
-            'key = value',
-            '[mon.3]',
-            'key = value',
-            '[mon.1]',
-            'key = value',
-            '',
-        ])
-
-        assert mon.concatenate_keyrings(self.args) == expected
+        result = mon.concatenate_keyrings(self.args).split('\n')
+        assert result.count('[mon.3]') == 1
+        assert result.count('[mon.2]') == 1
+        assert result.count('[mon.1]') == 1
 
     def test_errors_when_no_keyrings(self, tmpdir):
         self.args.keyrings = tmpdir.strpath