fix unit test upload.

- make upload testing more informative.
- fix subtitle upload on opencast 15.x

Author: ferishili

classes/local/attachment_helper.php

@@ -423,14 +423,13 @@ public static function upload_transcription_captions_set($storedlanguagefiles, $
             foreach ($storedlanguagefiles as $lang => $file) {
                 $subtitletags = $basesubtitletags;
                 $subtitletags[] = "lang:$lang";
-                $filestream = $apibridge->get_upload_filestream($file, 'file');
                 $mediapackagestr = self::removing_existing_transcription_in_mediapackage(
                     $mediapackagestr,
                     $mainmanualflavor,
                     $subtitletags
                 );
                 // Now that the existing are removed, we perform the add track via ingest.
-                $mediapackagestr = $apibridge->ingest_add_track($mediapackagestr, $mainmanualflavor, $filestream, $subtitletags);
+                $mediapackagestr = $apibridge->ingest_add_track($mediapackagestr, $mainmanualflavor, $file, $subtitletags);
             }
         }
 

tests/upload_ingest_with_configpanel_test.php

@@ -89,7 +89,7 @@ public function test_upload_ingest_configpanel(): void {
         set_config('apiconnecttimeout_1', $this->apiconnecttimeout, 'tool_opencast');
         // Block settings.
         set_config('ingestupload_1', 1, 'block_opencast');
-        set_config('uploadworkflow_1', 'schedule-and-upload', 'block_opencast');
+        set_config('uploadworkflow_1', 'fast', 'block_opencast');
         set_config('enableuploadwfconfigpanel_1', 1, 'block_opencast');
         set_config('alloweduploadwfconfigs_1', 'straightToPublishing', 'block_opencast');
         set_config('limituploadjobs_1', 2, 'block_opencast');
@@ -160,6 +160,8 @@ public function test_upload_ingest_configpanel(): void {
             }
         } while (!$isuploaded);
 
+        $this->assertEquals(true, $isuploaded, 'Video was not uploaded after reaching the maximum number of retries.');
+
         // Check if video was uploaded.
         $videos = $apibridge->get_course_videos($course->id);
 

tests/upload_test.php

@@ -146,6 +146,8 @@ public function test_upload(): void {
             }
         } while (!$isuploaded);
 
+        $this->assertEquals(true, $isuploaded, 'Video was not uploaded after reaching the maximum number of retries.');
+
         // Check if video was uploaded.
         $videos = $apibridge->get_course_videos($course->id);
 
@@ -229,7 +231,7 @@ private function notest_check_processed_video($identifier, $apibridge) {
      */
     private function notest_ensure_video_processed($identifier, $apibridge) {
         $isprocessed = false;
-        $limiter = 15;
+        $limiter = 40;
         $counter = 0;
         do {
             $isprocessed = $this->notest_check_processed_video($identifier, $apibridge);