[Git][NTPsec/ntpsec][20k-Nov22-install-test-fix] 2 commits: bin_test: change from waflibs.Utils.subprocess to subprocess

[James Browning]

James Browning pushed to branch 20k-Nov22-install-test-fix at NTPsec / ntpsec


Commits:
4cc681bc by James Browning at 2020-11-26T14:45:53-08:00
bin_test: change from waflibs.Utils.subprocess to subprocess


- - - - -
e44fc91e by James Browning at 2020-11-26T14:46:16-08:00
Revert "CI: print out existences of ntpdig"

This reverts commit 5b44f20b0b13368f6c8cb37d400e2a0d7b12c39d.

- - - - -


2 changed files:

- .gitlab-ci.yml
- wafhelpers/bin_test.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -19,7 +19,6 @@ alpine-edge-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 debian-oldstable-basic:
@@ -32,7 +31,6 @@ debian-oldstable-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 debian-testing-basic:
@@ -45,7 +43,6 @@ debian-testing-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 debian-unstable-basic:
@@ -58,7 +55,6 @@ debian-unstable-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 ubuntu-latest-basic:
@@ -71,7 +67,6 @@ ubuntu-latest-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 ubuntu-rolling-basic:
@@ -84,7 +79,6 @@ ubuntu-rolling-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 ubuntu-devel-basic:
@@ -97,7 +91,6 @@ ubuntu-devel-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 freebsd-11-basic:
@@ -140,7 +133,6 @@ centos-latest-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 fedora-latest-basic:
@@ -153,7 +145,6 @@ fedora-latest-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 fedora-rawhide-basic:
@@ -166,7 +157,6 @@ fedora-rawhide-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 openSUSE-leap-basic:
@@ -179,7 +169,6 @@ openSUSE-leap-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 openSUSE-tumbleweed-basic:
@@ -192,7 +181,6 @@ openSUSE-tumbleweed-basic:
     - DESTDIR=../prison python3 ./waf install||true
     - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - ls -ld {buid,.,..}/prison/usr/local/bin/ntpdig
     - rm -rf {buid,.,..}/prison
 
 gentoo-hardened-basic:


=====================================
wafhelpers/bin_test.py
=====================================
@@ -5,12 +5,12 @@ import os.path
 import sys
 import waflib.Context
 import waflib.Logs
-import waflib.Utils
+import subprocess
 sys.path.insert(0, "%s/main/tests/pylib" % waflib.Context.out_dir)
 import ntp.util
 
 version = ntp.util.stdversion()
-Popen = waflib.Utils.subprocess.Popen
+Popen = subprocess.Popen
 
 cmd_smap = {
     ("main/ntpd/ntpd", "--version"): "ntpd %s\n" % version,
@@ -73,9 +73,9 @@ def run(cmd, expected, pythonic, apath=None, environ=None):
 
     p = Popen(cmd, universal_newlines=True,
               env=environ, cwd=odir,
-              stdin=waflib.Utils.subprocess.PIPE,
-              stdout=waflib.Utils.subprocess.PIPE,
-              stderr=waflib.Utils.subprocess.PIPE)
+              stdin=subprocess.PIPE,
+              stdout=subprocess.PIPE,
+              stderr=subprocess.PIPE)
 
     stdout, stderr = p.communicate()
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/5b44f20b0b13368f6c8cb37d400e2a0d7b12c39d...e44fc91e765f6d20a157a9b0a7b55139b057adab

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/5b44f20b0b13368f6c8cb37d400e2a0d7b12c39d...e44fc91e765f6d20a157a9b0a7b55139b057adab
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20201126/589ee72b/attachment-0001.htm>