[py-svn] r57093 - py/branch/guido-svnwc-xml-status/py/path/svn/testing

[guido at codespeak.net]

Author: guido
Date: Fri Aug  8 09:20:37 2008
New Revision: 57093

Modified:
   py/branch/guido-svnwc-xml-status/py/path/svn/testing/test_wccommand.py
Log:
Small improvement in execution speed of the conflict test, made that it re-uses
the repo created in test setup rather than creating its own.


Modified: py/branch/guido-svnwc-xml-status/py/path/svn/testing/test_wccommand.py
==============================================================================
--- py/branch/guido-svnwc-xml-status/py/path/svn/testing/test_wccommand.py	(original)
+++ py/branch/guido-svnwc-xml-status/py/path/svn/testing/test_wccommand.py	Fri Aug  8 09:20:37 2008
@@ -157,20 +157,21 @@
             self.root.revert(rec=1)
 
     def test_status_conflict(self):
-        repo, wc = getrepowc('conflicttestrepo', 'conflictwc')
-        wccopy = py.path.svnwc(py.test.ensuretemp('conflictwccopy'))
+        wc = self.root
+        wccopy = py.path.svnwc(
+            py.test.ensuretemp('test_status_conflict_wccopy'))
         wccopy.checkout(wc.url)
-        p = wc.ensure('samplefile', file=1)
+        p = wc.ensure('conflictsamplefile', file=1)
         p.write('foo')
-        wc.commit('added samplefile')
+        wc.commit('added conflictsamplefile')
         wccopy.update()
-        assert wccopy.join('samplefile').check()
+        assert wccopy.join('conflictsamplefile').check()
         p.write('bar')
         wc.commit('wrote some data')
-        wccopy.join('samplefile').write('baz')
+        wccopy.join('conflictsamplefile').write('baz')
         wccopy.update()
         s = wccopy.status()
-        assert [x.basename for x in s.conflict] == ['samplefile']
+        assert [x.basename for x in s.conflict] == ['conflictsamplefile']
 
     def test_status_external(self):
         otherrepo, otherwc = getrepowc('externalrepo', 'externalwc')