cleanup and add as github action

zmap · May 28, 2024 · f48992e · f48992e
1 parent dec7f03
commit f48992e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 69 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,8 +36,21 @@ jobs:
           sudo rm /etc/resolv.conf
           sudo ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
           python --version
-          ./integration_tests.py
+          ./testing/integration_tests.py
+  build-and-test-top-1k:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.20'
+      - name: Build
+        run: |
+          go version
+          make
       - name: Large-Scale Integration Test
         run: |
           python --version
-          cat largescaleintegration/top-1k.csv | ./zdns A --iterative 
+          ./testing/large_scale_integration_test.py
diff --git a/largescaleintegration/large_scan_validator.py b/largescaleintegration/large_scan_validator.py
diff --git a/integration_tests.py → testing/integration_tests.py b/integration_tests.py → testing/integration_tests.py
@@ -39,7 +39,7 @@ def dictSort(d):
 class Tests(unittest.TestCase):
 
     maxDiff = None
-    ZDNS_EXECUTABLE = "./zdns" 
+    ZDNS_EXECUTABLE = "../zdns"
 
     def run_zdns_check_failure(self, flags, name, expected_err, executable=ZDNS_EXECUTABLE):
         flags = flags + " --threads=10"

diff --git a/largescaleintegration/top-1k.csv → testing/top-1k.csv b/largescaleintegration/top-1k.csv → testing/top-1k.csv
diff --git a/largescaleintegration/validators.py → testing/top_1k_domains_integration_tests.py b/largescaleintegration/validators.py → testing/top_1k_domains_integration_tests.py
@@ -11,7 +11,7 @@
 import unittest
 import json
 
-ZDNS_EXECUTABLE = "./zdns"
+ZDNS_EXECUTABLE = "../zdns"
 
 def can_request_successfully(domain: str, ip: str) -> bool:
     user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.3 Safari/605.1.15"