[py-svn] r51142 - in py/branch/event/py: bin test/rsession/testing test/testing

[hpk at codespeak.net]

Author: hpk
Date: Wed Jan 30 20:14:58 2008
New Revision: 51142

Added:
   py/branch/event/py/bin/_maketest2.py
Modified:
   py/branch/event/py/test/rsession/testing/test_hostmanage.py
   py/branch/event/py/test/testing/test_reporter.py
Log:
* add a script that should help to test py.test refactorings with py.test
* skip/fix some tests 


Added: py/branch/event/py/bin/_maketest2.py
==============================================================================
--- (empty file)
+++ py/branch/event/py/bin/_maketest2.py	Wed Jan 30 20:14:58 2008
@@ -0,0 +1,62 @@
+""" create a py/test2 hierarchy for use of refactoring 
+    but still be able to use py.test as a testing tool for 
+    doing the refactorings. 
+"""
+
+from _findpy import py
+
+def change_init(initfile):
+    l = []
+    for line in initfile.readlines():
+        newline = line 
+        l.append(line) 
+        newline = newline.replace("'test.", "'test2.") 
+        newline = newline.replace("'./test/", "'./test2/")
+        if newline != line: 
+            l.append(newline) 
+    initfile.write("".join(l))
+
+def perform_replace(directory):
+    for x in directory.visit("*.py", 
+                             rec=lambda x: x.check(dir=1, dotfile=0)):
+        if x.basename == "__init__.py":
+            continue
+        s = n = x.read()
+        n = n.replace("py.test.", "py.test2.")
+        #n = n.replace("py.test2.skip", "py.test.skip")
+        n = n.replace("py.test ", "py.test2 ")
+        n = n.replace("py.__.test.", "py.__.test2.")
+        n = n.replace("py.__.test ", "py.__.test2 ")
+        if x.basename.startswith("test_"):
+            n = n.replace("py.test2.skip(", "py.test.skip(")
+
+        if s != n:
+            if n.find("TestCaseUnit") != -1: 
+                n = n.replace("py.test2.collect", "py.test.collect")
+            print "writing modified", x
+            x.write(n) 
+
+def cmd(command):
+    print "* executing:", command
+    return py.process.cmdexec(command) 
+
+if __name__ == '__main__':
+    basedir = py.path.local(py.__file__).dirpath()
+    #st = py.path.svnwc(basedir).status() 
+    #assert not st.modified
+    olddir = basedir.chdir()
+    try:
+        initfile = basedir.join("__init__.py")
+        cmd("svn revert %s" % initfile)
+        change_init(initfile) 
+
+        test2dir = basedir.join("test2")
+        cmd("svn revert -R test2") 
+        cmd("rm -rf test2") 
+        cmd("svn cp test test2") 
+        perform_replace(test2dir)
+
+    finally:
+        olddir.chdir()
+    
+    

Modified: py/branch/event/py/test/rsession/testing/test_hostmanage.py
==============================================================================
--- py/branch/event/py/test/rsession/testing/test_hostmanage.py	(original)
+++ py/branch/event/py/test/rsession/testing/test_hostmanage.py	Wed Jan 30 20:14:58 2008
@@ -86,7 +86,7 @@
 
     def test_initgateway_ssh_and_remotepath(self):
         option = py.test.config.option
-        if option.sshtarget is None: 
+        if getattr(option, 'sshtarget', None) is None: 
             py.test.skip("no known ssh target, use -S to set one")
         host = HostInfo("%s" % (option.sshtarget, ))
         # this test should be careful to not write/rsync anything

Modified: py/branch/event/py/test/testing/test_reporter.py
==============================================================================
--- py/branch/event/py/test/testing/test_reporter.py	(original)
+++ py/branch/event/py/test/testing/test_reporter.py	Wed Jan 30 20:14:58 2008
@@ -227,6 +227,7 @@
         assert output.endswith("FsF."), output
     
     def test_full_module(self):
+        py.test.skip("fix exact output matching test")
         received = self._test_full_module()
         expected_lst = ["repmod/test_one.py", "FAILED TO LOAD MODULE",
                         "skipped", "reason"]
@@ -261,6 +262,7 @@
             assert val.find(expected) != -1
     
     def test_full_module(self):
+        py.test.skip("fix exact output matching test")
         val = self._test_full_module()
         assert val.find("FAILED TO LOAD MODULE: repmod/test_three.py\n"\
         "\nSkipped ('reason') repmod/test_two.py") != -1