ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/test/testcases/util/test_getinfo.py
(Generate patch)

Comparing ray/test/testcases/util/test_getinfo.py (file contents):
Revision 1.1 by schorsch, Mon Mar 28 17:48:43 2016 UTC vs.
Revision 1.2 by schorsch, Wed Mar 30 18:09:00 2016 UTC

# Line 26 | Line 26 | class GetinfoTestCase(unittest.TestCase, ProcMixin):
26                  cmd = ['getinfo', picfile]
27                  result = self._runit(cmd)
28                  exps = '''%s:
29 <        Xim format conversion by:
30 <        FORMAT=32-bit_rle_rgbe
31 <        pfilt -e 2 -x 512 -y 512 -p 1 -r .67
32 <        EXPOSURE=4.926198e+00
33 <        normpat
34 <        pfilt -1 -e .2
35 <        EXPOSURE=2.000000e-01
36 <        pfilt -x 128 -y 128
37 <        PIXASPECT=0.500000
38 <        EXPOSURE=2.571646e+00''' % picfile
29 >        Xim format conversion by:
30 >        FORMAT=32-bit_rle_rgbe
31 >        pfilt -e 2 -x 512 -y 512 -p 1 -r .67
32 >        EXPOSURE=4.926198e+00
33 >        normpat
34 >        pfilt -1 -e .2
35 >        EXPOSURE=2.000000e-01
36 >        pfilt -x 128 -y 128
37 >        PIXASPECT=0.500000
38 >        EXPOSURE=2.571646e+00
39 >        
40 > ''' % picfile
41                  expect = lcompare.split_headers(exps)
42                  try: lcompare.llcompare(result, expect, ignore_empty=1)
43                  except lcompare.error as e:
# Line 45 | Line 47 | class GetinfoTestCase(unittest.TestCase, ProcMixin):
47                  picfile = ts.datafile('Earth128.pic')
48                  cmd = ['getinfo', '-d', picfile]
49                  result = self._runit(cmd)
50 <                exps = '''%s: -Y 128 +X 128''' % picfile
50 >                exps = '''%s: -Y 128 +X 128\n''' % picfile
51                  expect = lcompare.split_headers(exps)
52                  try: lcompare.llcompare(result, expect, ignore_empty=1)
53                  except lcompare.error as e:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines