[GRASS-SVN] r64655 - grass/trunk/raster/r.in.poly/testsuite

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Feb 16 10:31:01 PST 2015


Author: annakrat
Date: 2015-02-16 10:31:01 -0800 (Mon, 16 Feb 2015)
New Revision: 64655

Modified:
   grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py
Log:
r.in.poly: fix test for Windows

Modified: grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py
===================================================================
--- grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py	2015-02-16 18:10:55 UTC (rev 64654)
+++ grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py	2015-02-16 18:31:01 UTC (rev 64655)
@@ -103,8 +103,8 @@
         self.tmpFile.close()
         self.assertModule('r.in.poly', input=self.tmpFile.name, output=self.rinpoly, type='DCELL')
         category = read_command('r.category', map=self.rinpoly, values=[-8, 3, 10.01]).strip()
-        self.assertEqual(first="-8\t\n3\tlabel2\n10.01\tlabel1", second=category,
-                         msg="Labels do not match")
+        self.assertEqual(first="-8\t{newline}3\tlabel2{newline}10.01\tlabel1".format(newline=os.linesep),
+                         second=category, msg="Labels do not match")
 
 
 if __name__ == '__main__':



More information about the grass-commit mailing list