Merge release changes into dev (#1154)

google · Feb 25, 2025 · 30f1854 · 30f1854
1 parent 5a0d8ca
commit 30f1854
Show file tree

Hide file tree

Showing 13 changed files with 670 additions and 14 deletions.
diff --git a/docs/dev/postman.json b/docs/dev/postman.json
diff --git a/framework/python/src/common/testreport.py b/framework/python/src/common/testreport.py
@@ -270,8 +270,6 @@ def to_html(self):
     logic = current_test_pack.get_logic()
     steps_to_resolve_ = logic.get_steps_to_resolve(json_data)
 
-    LOGGER.debug(steps_to_resolve_)
-
     module_reports = self._module_reports
     env_module = Environment(loader=BaseLoader())
     pages_num = self._pages_num(json_data)

diff --git a/framework/python/src/core/session.py b/framework/python/src/core/session.py
@@ -143,7 +143,6 @@ def __init__(self, root_dir):
 
     # System network interfaces
     self._ifaces = {}
-
     # Loading methods
     self._load_version()
     self._load_config()

diff --git a/framework/python/src/test_orc/test_orchestrator.py b/framework/python/src/test_orc/test_orchestrator.py
@@ -177,7 +177,6 @@ def run_test_modules(self):
     report = TestReport()
 
     generated_report_json = self._generate_report()
-
     report.from_json(generated_report_json)
     report.add_module_reports(self.get_session().get_module_reports())
     report.add_module_templates(self.get_session().get_module_templates())

diff --git a/framework/requirements.txt b/framework/requirements.txt
@@ -28,7 +28,7 @@ responses==0.25.3
 markdown==3.5.2
 
 # Requirements for the session
-cryptography==44.0.0
+cryptography==44.0.1
 pytz==2024.1
 
 # Requirements for the risk profile

diff --git a/make/DEBIAN/control b/make/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 2.1
+Version: 2.1.1
 Architecture: amd64
 Maintainer: Google <[email protected]>
 Homepage: https://github.com/google/testrun

diff --git a/modules/test/base/python/requirements.txt b/modules/test/base/python/requirements.txt
@@ -9,4 +9,4 @@ grpcio-tools==1.67.1
 netifaces==0.11.0
 
 # Requirements for reports generation
-Jinja2==3.1.4
+Jinja2==3.1.5
diff --git a/modules/test/conn/python/requirements.txt b/modules/test/conn/python/requirements.txt
@@ -2,7 +2,7 @@
 # Package dependencies should always be defined before the user defined
 # packages to prevent auto-upgrades of stable dependencies
 cffi==1.17.1
-cryptography==43.0.3
+cryptography==44.0.1
 pycparser==2.22
 six==1.16.0
 

diff --git a/modules/test/tls/python/requirements.txt b/modules/test/tls/python/requirements.txt
@@ -13,7 +13,7 @@ termcolor==2.4.0
 urllib3==2.2.2
 
 # User defined packages
-cryptography==43.0.1
+cryptography==44.0.1
 pyOpenSSL==24.3.0
 lxml==5.1.0 # Requirement of pyshark but if upgraded automatically above 5.1 will cause a
 pyshark==0.6

diff --git a/modules/test/tls/python/src/tls_module.py b/modules/test/tls/python/src/tls_module.py
@@ -37,6 +37,7 @@
 LOGGER = None
 REPORT_TEMPLATE_FILE = 'report_template.jinja2'
 
+
 class TLSModule(TestModule):
   """The TLS testing module."""
 

diff --git a/...src/app/pages/testrun/components/testrun-initiate-form/testrun-initiate-form.component.ts b/...src/app/pages/testrun/components/testrun-initiate-form/testrun-initiate-form.component.ts
@@ -93,6 +93,7 @@ export class TestrunInitiateFormComponent
   extends EscapableDialogComponent
   implements OnInit, AfterViewChecked
 {
+  private startRequestSent = new BehaviorSubject(false);
   override dialogRef: MatDialogRef<TestrunInitiateFormComponent>;
   data = inject<DialogData>(MAT_DIALOG_DATA);
   private readonly testRunService = inject(TestRunService);
@@ -204,7 +205,8 @@ export class TestrunInitiateFormComponent
       }
     );
 
-    if (this.selectedDevice) {
+    if (this.selectedDevice && !this.startRequestSent.value) {
+      this.startRequestSent.next(true);
       this.testRunService.fetchVersion();
       this.testRunService
         .startTestrun({
@@ -213,8 +215,13 @@ export class TestrunInitiateFormComponent
           test_modules: testModules,
         })
         .pipe(take(1))
-        .subscribe(status => {
-          this.cancel(status);
+        .subscribe({
+          next: status => {
+            this.cancel(status);
+          },
+          error: () => {
+            this.startRequestSent.next(false);
+          },
         });
     }
   }

diff --git a/resources/test_packs/pilot/report_templates/summary.jinja b/resources/test_packs/pilot/report_templates/summary.jinja
@@ -39,7 +39,7 @@
         <div class="summary-box-value">Complete</div>
         <div class="summary-box-label">Test Result</div>
         <div class="summary-box-value">{{ json_data['result'] }}</div>
-        <div class="summary-box-label">Preliminary Pilot Recommendation</div>
+        <div class="summary-box-label">Pilot Recommendation</div>
         <div style="color: white; font-size:24px; font-weight: 700;" class="summary-box-value">{{ json_data['status'] }}</div>
         <div class="summary-box-label">Started</div>
         <div class="summary-box-value">{{ json_data['started']}}</div>

diff --git a/testing/api/reports/report.pdf b/testing/api/reports/report.pdf