Merge branch 'master' into ring-0.14

* master: Fix join-set test to be deterministic. (#10263)
openethereum · Jan 30, 2019 · ea700a6 · ea700a6
2 parents b347599 + 12c42bc
commit ea700a6
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/parity/helpers.rs b/parity/helpers.rs
@@ -487,7 +487,14 @@ but the first password is trimmed
 		let mut test_set = HashSet::new();
 		test_set.insert("0x1111111111111111111111111111111111111111".to_string());
 		test_set.insert("0x0000000000000000000000000000000000000000".to_string());
-		assert_eq!("0x1111111111111111111111111111111111111111,0x0000000000000000000000000000000000000000".to_string(),
-		join_set(Some(&test_set)).unwrap());
+
+
+		let res = join_set(Some(&test_set)).unwrap();
+
+		assert!(
+			res == "0x1111111111111111111111111111111111111111,0x0000000000000000000000000000000000000000"
+			||
+			res == "0x0000000000000000000000000000000000000000,0x1111111111111111111111111111111111111111"
+		);
 	}
 }