summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-04-06 21:28:44 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-04-06 21:31:42 +0300
commitb4dea46d8b634fdfd3402b0caffa10d67461d281 (patch)
treeb7aab878d4bf595d6a921662cdd7ccd9ccb7a60e
parente2adff36089f5ac6fea0a144d4582f9b7a071d43 (diff)
tests: Fix few tests which depend on order of elements in dict.
With dict being unordered of course.
-rw-r--r--tests/basics/dict_clear.py2
-rw-r--r--tests/basics/dict_iterator.py4
-rw-r--r--tests/basics/dict_popitem.py15
-rw-r--r--tests/basics/dict_update.py2
-rw-r--r--tests/basics/iter-of-iter.py2
5 files changed, 16 insertions, 9 deletions
diff --git a/tests/basics/dict_clear.py b/tests/basics/dict_clear.py
index 6be2778be..575a84830 100644
--- a/tests/basics/dict_clear.py
+++ b/tests/basics/dict_clear.py
@@ -1,5 +1,5 @@
d = {1: 2, 3: 4}
-print(d)
+print(len(d))
d.clear()
print(d)
d[2] = 42
diff --git a/tests/basics/dict_iterator.py b/tests/basics/dict_iterator.py
index f190e32ff..b3df2ec02 100644
--- a/tests/basics/dict_iterator.py
+++ b/tests/basics/dict_iterator.py
@@ -1,3 +1,5 @@
d = {1: 2, 3: 4}
+els = []
for i in d:
- print(i, d[i])
+ els.append((i, d[i]))
+print(sorted(els))
diff --git a/tests/basics/dict_popitem.py b/tests/basics/dict_popitem.py
index 184735cde..e37bcec19 100644
--- a/tests/basics/dict_popitem.py
+++ b/tests/basics/dict_popitem.py
@@ -1,11 +1,16 @@
-d={1:2,3:4}
-print(d.popitem())
-print(d)
-print(d.popitem())
-print(d)
+els = []
+d = {1:2,3:4}
+a = d.popitem()
+print(len(d))
+els.append(a)
+a = d.popitem()
+print(len(d))
+els.append(a)
try:
print(d.popitem(), "!!!",)
except KeyError:
print("Raised KeyError")
else:
print("Did not raise KeyError")
+print(sorted(els))
+
diff --git a/tests/basics/dict_update.py b/tests/basics/dict_update.py
index e7ae0bd96..46d1f41b5 100644
--- a/tests/basics/dict_update.py
+++ b/tests/basics/dict_update.py
@@ -1,5 +1,5 @@
d = {1:2, 3:4}
-print(d)
+print(len(d))
d.update(["ab"])
print(d[1])
print(d[3])
diff --git a/tests/basics/iter-of-iter.py b/tests/basics/iter-of-iter.py
index 93368612b..ba5535629 100644
--- a/tests/basics/iter-of-iter.py
+++ b/tests/basics/iter-of-iter.py
@@ -3,6 +3,6 @@ print(list(i))
i = iter(iter([1, 2, 3]))
print(list(i))
i = iter(iter({1:2, 3:4, 5:6}))
-print(list(i))
+print(sorted(i))
i = iter(iter({1, 2, 3}))
print(list(i))