From c7929b150546074eea28a9c0d2f29daafdfe3c99 Mon Sep 17 00:00:00 2001 From: Aaron Vaage Date: Tue, 27 Feb 2018 10:58:24 -0800 Subject: [PATCH] Remove "with" from test names Remove the leading "with" from test directories. Bug: 73830478 Change-Id: I45a0914b5a0e56ec9d3340ec81eb5048c1d653a3 --- packager/app/test/packager_test.py | 10 +++++----- .../audio.m3u8 | 0 .../output.m3u8 | 0 .../output_audio.mp4 | Bin .../output_video.mp4 | Bin .../video.m3u8 | 0 .../audio.m3u8 | 0 .../output.m3u8 | 0 .../output_audio.mp4 | Bin .../output_video.mp4 | Bin .../video.m3u8 | 0 .../audio.m3u8 | 0 .../output.m3u8 | 0 .../output_audio.mp4 | Bin .../output_video.mp4 | Bin .../video.m3u8 | 0 .../output.mpd | 0 .../output_audio-1.m4s | Bin .../output_audio-2.m4s | Bin .../output_audio-3.m4s | Bin .../output_audio-init.mp4 | Bin .../output_video-1.m4s | Bin .../output_video-2.m4s | Bin .../output_video-3.m4s | Bin .../output_video-init.mp4 | Bin .../output.mpd | 0 .../output_audio-1.m4s | Bin .../output_audio-2.m4s | Bin .../output_audio-3.m4s | Bin .../output_audio-init.mp4 | Bin .../output_video-1.m4s | Bin .../output_video-2.m4s | Bin .../output_video-3.m4s | Bin .../output_video-init.mp4 | Bin 34 files changed, 5 insertions(+), 5 deletions(-) rename packager/app/test/testdata/{with-ec3-and-hls-single-segment-mp4-encrypted => ec3-and-hls-single-segment-mp4-encrypted}/audio.m3u8 (100%) rename packager/app/test/testdata/{with-ec3-and-hls-single-segment-mp4-encrypted => ec3-and-hls-single-segment-mp4-encrypted}/output.m3u8 (100%) rename packager/app/test/testdata/{with-ec3-and-hls-single-segment-mp4-encrypted => ec3-and-hls-single-segment-mp4-encrypted}/output_audio.mp4 (100%) rename packager/app/test/testdata/{with-ec3-and-hls-single-segment-mp4-encrypted => ec3-and-hls-single-segment-mp4-encrypted}/output_video.mp4 (100%) rename packager/app/test/testdata/{with-ec3-and-hls-single-segment-mp4-encrypted => ec3-and-hls-single-segment-mp4-encrypted}/video.m3u8 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted-and-ad-cues => hls-single-segment-mp4-encrypted-and-ad-cues}/audio.m3u8 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted-and-ad-cues => hls-single-segment-mp4-encrypted-and-ad-cues}/output.m3u8 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted-and-ad-cues => hls-single-segment-mp4-encrypted-and-ad-cues}/output_audio.mp4 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted-and-ad-cues => hls-single-segment-mp4-encrypted-and-ad-cues}/output_video.mp4 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted-and-ad-cues => hls-single-segment-mp4-encrypted-and-ad-cues}/video.m3u8 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted => hls-single-segment-mp4-encrypted}/audio.m3u8 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted => hls-single-segment-mp4-encrypted}/output.m3u8 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted => hls-single-segment-mp4-encrypted}/output_audio.mp4 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted => hls-single-segment-mp4-encrypted}/output_video.mp4 (100%) rename packager/app/test/testdata/{with-hls-single-segment-mp4-encrypted => hls-single-segment-mp4-encrypted}/video.m3u8 (100%) rename packager/app/test/testdata/{with-live-static-profile-and-ad-cues => live-static-profile-and-ad-cues}/output.mpd (100%) rename packager/app/test/testdata/{with-live-static-profile-and-ad-cues => live-static-profile-and-ad-cues}/output_audio-1.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile-and-ad-cues => live-static-profile-and-ad-cues}/output_audio-2.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile-and-ad-cues => live-static-profile-and-ad-cues}/output_audio-3.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile-and-ad-cues => live-static-profile-and-ad-cues}/output_audio-init.mp4 (100%) rename packager/app/test/testdata/{with-live-static-profile-and-ad-cues => live-static-profile-and-ad-cues}/output_video-1.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile-and-ad-cues => live-static-profile-and-ad-cues}/output_video-2.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile-and-ad-cues => live-static-profile-and-ad-cues}/output_video-3.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile-and-ad-cues => live-static-profile-and-ad-cues}/output_video-init.mp4 (100%) rename packager/app/test/testdata/{with-live-static-profile => live-static-profile}/output.mpd (100%) rename packager/app/test/testdata/{with-live-static-profile => live-static-profile}/output_audio-1.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile => live-static-profile}/output_audio-2.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile => live-static-profile}/output_audio-3.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile => live-static-profile}/output_audio-init.mp4 (100%) rename packager/app/test/testdata/{with-live-static-profile => live-static-profile}/output_video-1.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile => live-static-profile}/output_video-2.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile => live-static-profile}/output_video-3.m4s (100%) rename packager/app/test/testdata/{with-live-static-profile => live-static-profile}/output_video-init.mp4 (100%) diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py index 3cd5cc55af..99b681b221 100755 --- a/packager/app/test/packager_test.py +++ b/packager/app/test/packager_test.py @@ -1140,20 +1140,20 @@ class PackagerFunctionalTest(PackagerAppTest): self.assertPackageSuccess( self._GetStreams(['audio', 'video'], hls=True), self._GetFlags(encryption=True, output_hls=True)) - self._CheckTestResults('with-hls-single-segment-mp4-encrypted') + self._CheckTestResults('hls-single-segment-mp4-encrypted') def testPackageEc3AndHlsSingleSegmentMp4Encrypted(self): self.assertPackageSuccess( self._GetStreams( ['audio', 'video'], hls=True, test_files=['bear-640x360-ec3.mp4']), self._GetFlags(encryption=True, output_hls=True)) - self._CheckTestResults('with-ec3-and-hls-single-segment-mp4-encrypted') + self._CheckTestResults('ec3-and-hls-single-segment-mp4-encrypted') def testPackageHlsSingleSegmentMp4EncryptedAndAdCues(self): self.assertPackageSuccess( self._GetStreams(['audio', 'video'], hls=True), self._GetFlags(encryption=True, output_hls=True, ad_cues='1.5')) - self._CheckTestResults('with-hls-single-segment-mp4-encrypted-and-ad-cues') + self._CheckTestResults('hls-single-segment-mp4-encrypted-and-ad-cues') # Test HLS with multi-segment mp4 and content in subdirectories. def testPackageHlsMultiSegmentMp4WithCustomPath(self): @@ -1194,13 +1194,13 @@ class PackagerFunctionalTest(PackagerAppTest): self.assertPackageSuccess( self._GetStreams(['audio', 'video'], segmented=True), self._GetFlags(generate_static_mpd=True)) - self._CheckTestResults('with-live-static-profile') + self._CheckTestResults('live-static-profile') def testPackageLiveStaticProfileAndAdCues(self): self.assertPackageSuccess( self._GetStreams(['audio', 'video'], segmented=True), self._GetFlags(generate_static_mpd=True, ad_cues='1.5')) - self._CheckTestResults('with-live-static-profile-and-ad-cues') + self._CheckTestResults('live-static-profile-and-ad-cues') def testPackageLiveProfileAndEncryption(self): self.assertPackageSuccess( diff --git a/packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8 similarity index 100% rename from packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8 rename to packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8 diff --git a/packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 similarity index 100% rename from packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 rename to packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 diff --git a/packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/output_audio.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output_audio.mp4 similarity index 100% rename from packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/output_audio.mp4 rename to packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output_audio.mp4 diff --git a/packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/output_video.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output_video.mp4 similarity index 100% rename from packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/output_video.mp4 rename to packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output_video.mp4 diff --git a/packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/video.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/video.m3u8 similarity index 100% rename from packager/app/test/testdata/with-ec3-and-hls-single-segment-mp4-encrypted/video.m3u8 rename to packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/video.m3u8 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/output_audio.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output_audio.mp4 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/output_audio.mp4 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output_audio.mp4 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/output_video.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output_video.mp4 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/output_video.mp4 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output_video.mp4 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/audio.m3u8 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/audio.m3u8 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted/audio.m3u8 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/output.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/output.m3u8 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/output_audio.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output_audio.mp4 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/output_audio.mp4 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted/output_audio.mp4 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/output_video.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output_video.mp4 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/output_video.mp4 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted/output_video.mp4 diff --git a/packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/video.m3u8 similarity index 100% rename from packager/app/test/testdata/with-hls-single-segment-mp4-encrypted/video.m3u8 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted/video.m3u8 diff --git a/packager/app/test/testdata/with-live-static-profile-and-ad-cues/output.mpd b/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd similarity index 100% rename from packager/app/test/testdata/with-live-static-profile-and-ad-cues/output.mpd rename to packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd diff --git a/packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_audio-1.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-1.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_audio-1.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-1.m4s diff --git a/packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_audio-2.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-2.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_audio-2.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-2.m4s diff --git a/packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_audio-3.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-3.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_audio-3.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-3.m4s diff --git a/packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_audio-init.mp4 b/packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_audio-init.mp4 rename to packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-init.mp4 diff --git a/packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_video-1.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-1.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_video-1.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-1.m4s diff --git a/packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_video-2.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-2.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_video-2.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-2.m4s diff --git a/packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_video-3.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-3.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_video-3.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-3.m4s diff --git a/packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_video-init.mp4 b/packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-init.mp4 similarity index 100% rename from packager/app/test/testdata/with-live-static-profile-and-ad-cues/output_video-init.mp4 rename to packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-init.mp4 diff --git a/packager/app/test/testdata/with-live-static-profile/output.mpd b/packager/app/test/testdata/live-static-profile/output.mpd similarity index 100% rename from packager/app/test/testdata/with-live-static-profile/output.mpd rename to packager/app/test/testdata/live-static-profile/output.mpd diff --git a/packager/app/test/testdata/with-live-static-profile/output_audio-1.m4s b/packager/app/test/testdata/live-static-profile/output_audio-1.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile/output_audio-1.m4s rename to packager/app/test/testdata/live-static-profile/output_audio-1.m4s diff --git a/packager/app/test/testdata/with-live-static-profile/output_audio-2.m4s b/packager/app/test/testdata/live-static-profile/output_audio-2.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile/output_audio-2.m4s rename to packager/app/test/testdata/live-static-profile/output_audio-2.m4s diff --git a/packager/app/test/testdata/with-live-static-profile/output_audio-3.m4s b/packager/app/test/testdata/live-static-profile/output_audio-3.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile/output_audio-3.m4s rename to packager/app/test/testdata/live-static-profile/output_audio-3.m4s diff --git a/packager/app/test/testdata/with-live-static-profile/output_audio-init.mp4 b/packager/app/test/testdata/live-static-profile/output_audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/with-live-static-profile/output_audio-init.mp4 rename to packager/app/test/testdata/live-static-profile/output_audio-init.mp4 diff --git a/packager/app/test/testdata/with-live-static-profile/output_video-1.m4s b/packager/app/test/testdata/live-static-profile/output_video-1.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile/output_video-1.m4s rename to packager/app/test/testdata/live-static-profile/output_video-1.m4s diff --git a/packager/app/test/testdata/with-live-static-profile/output_video-2.m4s b/packager/app/test/testdata/live-static-profile/output_video-2.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile/output_video-2.m4s rename to packager/app/test/testdata/live-static-profile/output_video-2.m4s diff --git a/packager/app/test/testdata/with-live-static-profile/output_video-3.m4s b/packager/app/test/testdata/live-static-profile/output_video-3.m4s similarity index 100% rename from packager/app/test/testdata/with-live-static-profile/output_video-3.m4s rename to packager/app/test/testdata/live-static-profile/output_video-3.m4s diff --git a/packager/app/test/testdata/with-live-static-profile/output_video-init.mp4 b/packager/app/test/testdata/live-static-profile/output_video-init.mp4 similarity index 100% rename from packager/app/test/testdata/with-live-static-profile/output_video-init.mp4 rename to packager/app/test/testdata/live-static-profile/output_video-init.mp4