.gitignore

@@ -1,69 +1,2 @@
 .DS_Store
 TEST-*.xml
-
-## VIM
-# Swap
-[._]*.s[a-v][a-z]
-#!*.svg  # comment out if you don't need vector files
-[._]*.sw[a-p]
-[._]s[a-rt-v][a-z]
-[._]ss[a-gi-z]
-[._]sw[a-p]
-
-# Session
-Session.vim
-Sessionx.vim
-
-# Temporary
-.netrwhist
-*~
-# Auto-generated tag files
-tags
-# Persistent undo
-[._]*.un~
-## END VIM
-
-## MacOS
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-## END MacOS
-
-## Linux
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-## END Linux

Jenkinsfile

@@ -105,8 +105,7 @@ pipeline {
     stage('Integration Tests') {
       steps {
 	sh 'mkdir -p test/results/integration'
-	sh 'bats -F junit test/integration/dns/kameronkenny.com/*.bat test/integration/dns/kameronkenny.com/**/*.bat > test/results/integration/TEST-Integration-dns-kameronkenny_com.xml'
+	sh 'bats -F junit test/integration/dns/**/*.bat test/integration/dns/**/**/*.bat > test/results/integration/TEST-Integration-dns.xml'
-	sh 'bats -F junit test/integration/dns/in.thelinuxpro.net/*.bat test/integration/dns/in.thelinuxpro.net/**/*.bat > test/results/integration/TEST-Integration-dns-in_thelinuxpro_net.xml'
       }
     }
   }

test/integration/dns/in.thelinuxpro.net/local-setup.bash

@@ -2,7 +2,7 @@
 
 _local_setup() {
   DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd)"
-  TEST_ROOT="$( cd "$( dirname "$DIR/../../" )" >/dev/null 2>&1 && pwd)"
+  TEST_ROOT="$( cd "$( dirname "$DIR/../../../" )" >/dev/null 2>&1 && pwd)"
   bats_load_library bats-support
   bats_load_library bats-assert
   source "$DIR/helper.bash"

test/integration/dns/kameronkenny.com/local-setup.bash

@@ -2,7 +2,7 @@
 
 _local_setup() {
   DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd)"
-  TEST_ROOT="$( cd "$( dirname "$DIR/../../" )" >/dev/null 2>&1 && pwd)"
+  TEST_ROOT="$( cd "$( dirname "$DIR/../../../" )" >/dev/null 2>&1 && pwd)"
   bats_load_library bats-support
   bats_load_library bats-assert
   source "$DIR/helper.bash"