From a2438554f671ad4f9878e57e6efa275e7c20672b Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Tue, 29 Mar 2016 17:37:58 -0700 Subject: [PATCH] Fix gpylint errors on packager_test.py Change-Id: I28074c4e9270279ebb83f64b2f9f615b4f705079 --- packager/app/test/packager_test.py | 16 ++++++++-------- .../bear-640x360-av-live-cenc-golden.mpd | 2 +- .../bear-640x360-av-live-cenc-iop-golden.mpd | 2 +- ...bear-640x360-av-live-cenc-rotation-golden.mpd | 2 +- ...-640x360-av-live-cenc-rotation-iop-golden.mpd | 2 +- .../testdata/bear-640x360-av-live-golden.mpd | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py index 8a8a1c956f..ade8cbe1cf 100755 --- a/packager/app/test/packager_test.py +++ b/packager/app/test/packager_test.py @@ -41,7 +41,7 @@ class PackagerAppTest(unittest.TestCase): def testVersion(self): self.assertRegexpMatches( self.packager.Version(), '^edash-packager version ' - '((?P[\w\.]+)-)?(?P[a-f\d]+)-(debug|release)$') + r'((?P[\w\.]+)-)?(?P[a-f\d]+)-(debug|release)$') def testDumpStreamInfo(self): test_file = os.path.join(self.test_data_dir, 'bear-640x360.mp4') @@ -390,9 +390,9 @@ class PackagerAppTest(unittest.TestCase): '--content_id=3031323334353637', '--signer=widevine_test'] elif encryption: pssh_box = ('000000307073736800000000' # PSSH header - 'edef8ba979d64acea3c827dcd51d21ed' # Widevine system ID - '00000010' # Data size - '31323334353637383930313233343536') # Data + 'edef8ba979d64acea3c827dcd51d21ed' # Widevine system ID + '00000010' # Data size + '31323334353637383930313233343536') # Data flags += ['--enable_fixed_key_encryption', '--key_id=31323334353637383930313233343536', '--key=32333435363738393021323334353637', @@ -480,10 +480,10 @@ class PackagerAppTest(unittest.TestCase): publish_time = m.group(0) print publish_time with open(test_output, 'w') as f: - f.write(content.replace( - availability_start_time, - 'availabilityStartTime="place_holder"').replace( - publish_time, 'publishTime="some_publish_time"')) + f.write(content.replace( + availability_start_time, + 'availabilityStartTime="some_availability_start_time"').replace( + publish_time, 'publishTime="some_publish_time"')) self._DiffGold(test_output, golden_file_name) diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd index 41b130dcc1..a3fbb022d4 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd @@ -1,6 +1,6 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd index 7a33a0091f..3f9cb407c6 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd @@ -1,6 +1,6 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd index ab8aa0b0f6..cbe5e40c76 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd @@ -1,6 +1,6 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd index 6218752830..780da4c10f 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd @@ -1,6 +1,6 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-live-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-golden.mpd index dcdb6e4bc5..79a43d07a7 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-golden.mpd @@ -1,6 +1,6 @@ - +