Organize unit tests and add integration tests with hsd

.github/workflows/test-windows.yaml

@@ -1,4 +1,4 @@
-name: Test - Windows
+name: Test
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [master]
 
 jobs:
-  build:
+  build-windows-latest:
     runs-on: windows-latest
     defaults:
       run:
@@ -17,6 +17,7 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
+          path-type: inherit
           update: true
           install: git mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-unbound autotools
 
@@ -26,9 +27,18 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build
-        run: ./autogen.sh && ./configure && make
+        run: ./autogen.sh && ./configure --with-network=regtest && make
 
       - name: Unit Tests
         run: ./test_hnsd
 
-    # TODO: Install nodejs, intall hsd and test end-to-end integration.
+      - name: Setup Integration
+        uses: actions/[email protected]
+        with:
+          node-version: 18
+
+      - name: Integration Tests
+        working-directory: ./integration
+        run:  |
+              npm install
+              npm run test

.github/workflows/test.yml

@@ -25,9 +25,18 @@ jobs:
         run: sudo apt-get install -y libunbound-dev
 
       - name: Build
-        run: ./autogen.sh && ./configure && make
+        run: ./autogen.sh && ./configure --with-network=regtest && make
 
       - name: Unit Tests
         run: ./test_hnsd
 
-      # TODO: Install nodejs, intall hsd and test end-to-end integration.
+      - name: Setup Integration
+        uses: actions/[email protected]
+        with:
+          node-version: 18
+
+      - name: Integration Tests
+        working-directory: ./integration
+        run: |
+          npm install
+          npm run test

.gitignore

@@ -50,3 +50,4 @@ m4/ltversion.m4
 m4/lt~obsolete.m4
 src/stamp-h1
 test_hnsd
+integration/node_modules/

Makefile.am

@@ -77,7 +77,9 @@ hnsd_CPPFLAGS = $(AM_CPPFLAGS)
 
 noinst_PROGRAMS = test_hnsd
 
-test_hnsd_SOURCES = test/hnsd-test.c
+test_hnsd_SOURCES = test/hnsd-test.c     \
+                    test/base32-test.c   \
+                    test/resource-test.c
 
 test_hnsd_LDFLAGS = -static
 test_hnsd_CPPFLAGS = $(AM_CPPFLAGS)
@@ -87,3 +89,8 @@ test_hnsd_LDADD = $(LIB_UNBOUND)             \
 
 # pkgconfigdir = $(libdir)/pkgconfig
 # pkgconfig_DATA = @[email protected]
+
+.PHONY: e2e
+e2e:
+	npm --prefix ./integration/ install
+	npm --prefix ./integration/ run test

README.md

@@ -345,10 +345,33 @@ $ hnsd [options]
 
 ## Testing
 
+### Unit tests
+
 The `make` command will output two binaries into the root directory: `hnsd`
 and `test_hnsd`, which is compiled from unit tests in the `test/` directory.
 Run the tests with `./test_hnsd`.
 
+### Integration tests
+
+The `integration/` directory contains a nodejs package that installs hsd and
+runs a bmocha test suite. `hnsd` is run using `child_process.spawn()` and tested
+by making DNS queries to its open ports.
+
+`hnsd` MUST be built in regtest mode: `./configure --with-network=regtest`
+
+Build and run the integration tests (requires nodejs >= v16):
+
+```
+make e2e
+```
+
+or:
+
+```
+npm --prefix ./integration install
+npm --prefix ./integration run test
+```
+
 ## License
 
 - Copyright (c) 2018, Christopher Jeffrey (MIT License).