diff --git a/devenv.nix b/devenv.nix index fc622ce6fe256d1d82e7f9c9d8a1a80deab4e63c..06f21d35c537b1c2172d08cf6adbbadd5f261de5 100644 --- a/devenv.nix +++ b/devenv.nix @@ -89,7 +89,6 @@ Match User root PermitRootLogin no AllowUsers demo root EOF - ${pkgs.openssh}/bin/sshd -D -e -o \ HostKey=${config.devenv.root}/.config/temp_rsa_key \ @@ -98,7 +97,6 @@ EOF -o Port=''${1:-2222} \ -o AuthorizedKeysFile=${config.devenv.root}/.devenv/chroot/home/demo/.ssh/authorized_keys \ -o PidFile=${config.devenv.root}/.devenv/sshd.pid - ''; scripts.draw-graph.exec = '' @@ -117,10 +115,6 @@ EOF else echo "not deleting; file is at $tmpOutput" fi - - - - ''; scripts.get-go-default-packages.exec = '' @@ -135,9 +129,9 @@ EOF set -x ${pkgs.gosec}/bin/gosec ${config.devenv.root} -${pkgs.go}/bin/go test -tags=runOnTask -cover -v ${config.devenv.root} -${pkgs.go}/bin/go test -tags=runOnTask -bench -v ${config.devenv.root} -${pkgs.go}/bin/go test -tags=runOnTask -race -v ${config.devenv.root} +${pkgs.go}/bin/go test -mod=mod -tags 'runOnTask,osusergo,netgo' -a -ldflags "-extldflags '-static' -s -w" -cover -v ${config.devenv.root} +${pkgs.go}/bin/go test -mod=mod -tags 'runOnTask,osusergo,netgo' -a -ldflags "-extldflags '-static' -s -w" -bench -v ${config.devenv.root} +${pkgs.go}/bin/go test -mod=mod -tags 'runOnTask,osusergo,netgo' -a -ldflags "-extldflags '-static' -s -w" -race -v ${config.devenv.root} ''; diff --git a/scheduler_test.go b/scheduler_test.go index 61edd28eb5da9f52af13981b1da1df67e3a5263e..64e2ca037b74ea013e81ff20294f4bb8902032dd 100644 --- a/scheduler_test.go +++ b/scheduler_test.go @@ -444,7 +444,7 @@ interval: "1m1s" err := yaml.Unmarshal([]byte(yamlData), &sp) assert.Nil(t, err, "Unmarshalling should not produce an error") - expectedInterval, _ := time.ParseDuration("1m") - assert.Equal(t, "interval", sp.Type, "Type should be unmarshalled correctly") + expectedInterval, _ := time.ParseDuration("1m1s") + assert.Equal(t, "Interval", sp.Type, "Type should be unmarshalled correctly") assert.Equal(t, expectedInterval, sp.Interval, "Interval should be unmarshalled correctly") }