[py-svn] r36866 - py/branch/conftest/py/test/rsession/testing

[hpk at codespeak.net]

Author: hpk
Date: Wed Jan 17 12:29:52 2007
New Revision: 36866

Modified:
   py/branch/conftest/py/test/rsession/testing/test_reporter.py
   py/branch/conftest/py/test/rsession/testing/test_rsession.py
Log:
relax some more rsession tests to not test exact output


Modified: py/branch/conftest/py/test/rsession/testing/test_reporter.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_reporter.py	(original)
+++ py/branch/conftest/py/test/rsession/testing/test_reporter.py	Wed Jan 17 12:29:52 2007
@@ -170,7 +170,7 @@
      host1: READY (still 2 to go)
      host2: READY (still 1 to go)
      host3: READY"""
-        assert out.startswith(expected)
+        assert out.find(expected) != -1
 
 class TestLocalReporter(AbstractTestReporter):
     reporter = LocalReporter
@@ -191,7 +191,7 @@
 repmod/test_one.py[1] 
 repmod/test_three.py[0] - FAILED TO LOAD MODULE
 repmod/test_two.py[0] - skipped (reason)"""
-        assert received == expected
+        assert received.find(expected) != -1 
 
 class TestRemoteReporter(AbstractTestReporter):
     reporter = RemoteReporter
@@ -207,7 +207,7 @@
  localhost: FAILED  py test rsession testing test_slave.py funcpass
  localhost: PASSED  py test rsession testing test_slave.py funcpass
 """
-        assert val == expected
+        assert val.find(expected) != -1
     
     def test_module(self):
         val = self._test_module()
@@ -217,10 +217,10 @@
  localhost: FAILED  py test rsession testing test_slave.py funcpass
  localhost: PASSED  py test rsession testing test_slave.py funcpass
 """
-        assert val == expected
+        assert val.find(expected) != -1
     
     def test_full_module(self):
         #py.test.skip("XXX rewrite test to not rely on exact formatting")
         val = self._test_full_module()
-        assert val == 'FAILED TO LOAD MODULE: repmod/test_three.py\n'\
-        '\nSkipped (reason) repmod/test_two.py\n\n'
+        assert val.find('FAILED TO LOAD MODULE: repmod/test_three.py\n'\
+        '\nSkipped (reason) repmod/test_two.py') != -1

Modified: py/branch/conftest/py/test/rsession/testing/test_rsession.py
==============================================================================
--- py/branch/conftest/py/test/rsession/testing/test_rsession.py	(original)
+++ py/branch/conftest/py/test/rsession/testing/test_rsession.py	Wed Jan 17 12:29:52 2007
@@ -214,7 +214,7 @@
         assert len(skipped) == len(nodes)
         assert len(events) == 4 * len(nodes)
         # one of passed for each node has non-empty stdout
-        passed_stdout = [i for i in passed if i.outcome.stdout == 'samfing\n']
+        passed_stdout = [i for i in passed if i.outcome.stdout.find('samfing') != -1]
         assert len(passed_stdout) == len(nodes), passed
 
     def test_config_pass(self):