Resolve merge conflicts

.github/workflows/testing.yml

@@ -25,38 +25,6 @@ jobs:
       - name: Run baseline tests
         shell: bash {0}
         run: testing/baseline/test_baseline
-
-  # testrun_tests:
-  #   permissions: {}
-  #   name:  Tests
-  #   runs-on: ubuntu-20.04
-  #   needs: testrun_baseline
-  #   timeout-minutes: 45
-  #   steps:
-  #     - name: Checkout source
-  #       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-  #     - name: Install dependencies
-  #       shell: bash {0}
-  #       run: cmd/prepare
-  #     - name: Package Testrun  
-  #       shell: bash {0}
-  #       run: cmd/package
-  #     - name: Install Testrun
-  #       shell: bash {0}
-  #       run: sudo dpkg -i testrun*.deb
-  #     - name: Run tests
-  #       shell: bash {0}
-  #       run: testing/tests/test_tests
-  #     - name: Archive runtime results
-  #       if: ${{ always() }}
-  #       run: sudo tar --exclude-vcs -czf runtime.tgz /usr/local/testrun/runtime/
-  #     - name: Upload runtime results
-  #       uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
-  #       if: ${{ always() }}
-  #       with:
-  #         if-no-files-found: error
-  #         name: runtime_tests_${{ github.run_id }}
-  #         path: runtime.tgz
 
   testrun_api:
     permissions: {}

.gitignore

@@ -17,4 +17,4 @@ testing/unit/report/output/
 *.deb
 make/DEBIAN/postinst
 
-testrun.log
+testrun.log

README.md

@@ -43,7 +43,7 @@ Once you have met the hardware and software requirements, you can get started wi
 Testrun will constantly evolve to further support end-users by automating device network behaviour against industry standards. For further information on upcoming features, check out the [Roadmap](docs/roadmap.pdf).
 
 ## Accessibility :busts_in_silhouette:
-we are proud of our tool and strive to provide an enjoyable experience for all of our users. Testrun goes through rigorous accessibility testing at each release. You can read more about [Google and Accessibility here](https://www.google.co.uk/accessibility). You are welcome to submit a new issue and provide feedback on our implementations.
+We are proud of our tool and strive to provide an enjoyable experience for all of our users. Testrun goes through rigorous accessibility testing at each release. You can read more about [Google and Accessibility here](https://www.google.co.uk/accessibility). You are welcome to submit a new issue and provide feedback on our implementations.
 
 ## Issue reporting :triangular_flag_on_post:
 If the application has come across a problem at any point during setup or use, please raise an issue under the [issues tab](https://github.com/auto-iot/test-run/issues). Issue templates exist for both bug reports and feature requests. If neither of these are appropriate for your issue, raise a blank issue instead.

cmd/package

@@ -56,4 +56,4 @@ cp -r {framework,modules} $MAKE_SRC_DIR/usr/local/testrun
 dpkg-deb --build --root-owner-group make
 
 # Rename the .deb file
-mv make.deb testrun_1-2-alpha_amd64.deb
+mv make.deb testrun_1-2_amd64.deb

framework/python/src/common/testreport.py

@@ -57,7 +57,7 @@ def __init__(self,
     self._report_url = ''
     self._cur_page = 0
     # Placeholder until available in json report
-    self._version = 'v1.2-alpha'
+    self._version = 'v1.2'
 
   def add_module_reports(self, module_reports):
     self._module_reports = module_reports
@@ -451,6 +451,36 @@ def generate_summary(self, json_data):
 
     summary += '</div>'
 
+    # Add device configuration
+    summary += '''
+    <div class="summary-device-modules">
+      <div class="summary-item-label" style="margin-bottom:10px;">
+        <h4>Device Configuration</h4>
+      </div>
+    '''
+
+    if 'test_modules' in json_data['device']:
+
+      sorted_modules = {}
+
+      for test_module in json_data['device']['test_modules']:
+        if 'enabled' in json_data['device']['test_modules'][test_module]:
+          sorted_modules[test_module] = json_data['device']['test_modules'][
+            test_module]['enabled']
+
+      # Sort the modules by enabled first
+      sorted_modules = sorted(sorted_modules.items(),
+                              key=lambda x:x[1],
+                              reverse=True)
+
+      for module in sorted_modules:
+        summary += self.generate_device_module_label(
+          module[0],
+          module[1]
+        )
+
+    summary += '</div>'
+
     # Add the result summary
     summary += self.generate_result_summary(json_data)
 

make/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 1.2-alpha
+Version: 1.2
 Architecture: amd64
 Maintainer: Google <boddey@google.com>
 Homepage: https://github.com/google/testrun

modules/test/tls/python/src/tls_module.py

@@ -26,8 +26,7 @@
 STARTUP_CAPTURE_FILE = '/runtime/device/startup.pcap'
 MONITOR_CAPTURE_FILE = '/runtime/device/monitor.pcap'
 TLS_CAPTURE_FILE = '/runtime/output/tls.pcap'
-
-LOGGER = None
+GATEWAY_CAPTURE_FILE = '/runtime/network/gateway.pcap'
 
 
 class TLSModule(TestModule):