[pypy-commit] pypy default: move a test to the right location

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r76293:1d15f3b8dad9
Date: 2015-03-10 01:52 +0000
http://bitbucket.org/pypy/pypy/changeset/1d15f3b8dad9/

Log:	move a test to the right location

diff --git a/rpython/annotator/test/test_annrpython.py b/rpython/annotator/test/test_annrpython.py
--- a/rpython/annotator/test/test_annrpython.py
+++ b/rpython/annotator/test/test_annrpython.py
@@ -4326,13 +4326,6 @@
         assert isinstance(s, annmodel.SomeString)
         assert not s.can_be_none()
 
-    def test_nonnulify(self):
-        s = annmodel.SomeString(can_be_None=True).nonnulify()
-        assert s.can_be_None is True
-        assert s.no_nul is True
-        s = annmodel.SomeChar().nonnulify()
-        assert s.no_nul is True
-
 
 def g(n):
     return [0, 1, 2, n]
diff --git a/rpython/annotator/test/test_model.py b/rpython/annotator/test/test_model.py
--- a/rpython/annotator/test/test_model.py
+++ b/rpython/annotator/test/test_model.py
@@ -117,3 +117,11 @@
     assert s_int != SomeInteger()
     assert not_const(s_int) == SomeInteger()
     assert not_const(s_None) == s_None
+
+
+def test_nonnulify():
+    s = SomeString(can_be_None=True).nonnulify()
+    assert s.can_be_None is True
+    assert s.no_nul is True
+    s = SomeChar().nonnulify()
+    assert s.no_nul is True