Revert "regression-tests.nobackend - soa-edit: use datefudge instead of faketime"

This reverts commit a71b2f53027d5ea115121fc5146c96d9dd6da8d2.

diff --git a/.github/actions/spell-check/allow.txt b/.github/actions/spell-check/allow.txt
index f503d0b0094eb6e9d777f01c5bf630627ffd5b56..05da556265e7720258d2e2d671f84d96b44093c8 100644 (file)
--- a/.github/actions/spell-check/allow.txt
+++ b/.github/actions/spell-check/allow.txt
@@ -607,7 +607,6 @@ datalen
 datapoints
 datapos
 dataret
-datefudge
 datestr
 datetime
 DBC

diff --git a/regression-tests.nobackend/README b/regression-tests.nobackend/README
index bd2da1d0cf97e9a2f0118daed1dec73eb696bfff..8dc8ab6b62ba5e67d4bc573fddd69249a0040ee0 100644 (file)
--- a/regression-tests.nobackend/README
+++ b/regression-tests.nobackend/README
@@ -1,4 +1,4 @@
 To run these tests, you need a PowerDNS Authoritative Server with bind,
 gsqlite3, lmdb and random backends.
 
-You also will need to have 'datefudge' installed.
+You also will need to have 'faketime' installed.

diff --git a/regression-tests.nobackend/soa-edit/command b/regression-tests.nobackend/soa-edit/command
index e77acf73a41ae8aa3fa9e93ffa37875bbe135f1a..e935fdd98569935e1268486ff61be3fd611480e6 100755 (executable)
--- a/regression-tests.nobackend/soa-edit/command
+++ b/regression-tests.nobackend/soa-edit/command
@@ -28,10 +28,12 @@ rm -f pdns*.pid
 
 rm -f soa-edit/bind-dnssec.db
 
+now=$(LC_ALL=C date +%s)
+delta=$((now-1418860790)) # Wed Dec 17 23:59:50 2014 UTC
+
 $PDNSUTIL --config-dir=soa-edit create-bind-db soa-edit/bind-dnssec.db
 $PDNSUTIL --config-dir soa-edit/ set-meta minimal.com SOA-EDIT INCREMENT-WEEKS
-# Wed Dec 17 23:59:50 2014 UTC
-datefudge "$(LC_ALL=C date -d@1418860790)" $PDNS --config-dir=soa-edit &
+faketime -m -f -$delta $PDNS --config-dir=soa-edit &
 bindwait
 
 $SDIG 127.0.0.1 $port minimal.com SOA | LC_ALL=C sort

diff --git a/tasks.py b/tasks.py
index a267dda594b60e6e99e2b8d22ff251e361336c91..87df630a136b281e2f4881f88a43c92c6040888b 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -112,7 +112,7 @@ auth_test_deps = [   # FIXME: we should be generating some of these from shlibde
     'curl',
     'default-jre-headless',
     'bind9-dnsutils',
-    'datefudge',
+    'faketime',
     'gawk',
     'krb5-user',
     'ldnsutils',