cmd = "docker rmi {images}:{testname}"
sx____(cmd.format(**locals()))
self.rm_testdir()
- def test_9211_centos7_automake_dockerfile(self):
+ def test_911_centos7_am_cm_dockerfile(self):
if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
- testname1=self.testname() + "_1"
- testname2=self.testname() + "_2"
+ testname1=self.testname() + "_am"
+ testname2=self.testname() + "_cm"
testdir = self.testdir()
dockerfile1="testbuilds/centos7-am-build.dockerfile"
dockerfile2="testbuilds/centos7-cm-build.dockerfile"
cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local --exclude _config.h"
sx____(cmd.format(**locals()))
out = output(cmd.format(**locals()))
+ if "---" in out or "Only" in out:
+ logg.warning("out>>\n%s", out)
self.assertFalse(greps(out, "---"))
self.assertFalse(greps(out, "Only"))
#
cmd = "docker rm --force {testname2}"
sx____(cmd.format(**locals()))
self.rm_testdir()
- def test_9212_centos7_automake_dockerfile(self):
+ def test_912_centos8_am_cm_dockerfile(self):
if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
- testname1=self.testname() + "_1"
- testname2=self.testname() + "_2"
+ testname1=self.testname() + "_am"
+ testname2=self.testname() + "_cm"
testdir = self.testdir()
dockerfile1="testbuilds/centos8-am-build.dockerfile"
dockerfile2="testbuilds/centos8-cm-build.dockerfile"
cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local --exclude _config.h"
sx____(cmd.format(**locals()))
out = output(cmd.format(**locals()))
+ if "---" in out or "Only" in out:
+ logg.warning("out>>\n%s", out)
self.assertFalse(greps(out, "---"))
self.assertFalse(greps(out, "Only"))
#