fix up test case to just one extra target and fix flake8 error

CentOS-PaaS-SIG · Jul 6, 2018 · cb4d1a0 · cb4d1a0
1 parent 23729fb
commit cb4d1a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/config/Dockerfiles/tests.d/beaker/02_beaker_distro b/config/Dockerfiles/tests.d/beaker/02_beaker_distro
@@ -9,15 +9,14 @@ DISTRO=${1}
 PROVIDER=${2}
 
 PINFILE="PinFile.${PROVIDER}.yml"
-DTARGET="beaker-distro"
-FTARGET="beaker-family"
+TARGET="beaker-family"
 TMP_FILE=$(mktemp)
 
 function clean_up {
     set +e
-    linchpin -w . -p "${PINFILE}" -v destroy "${DTARGET}" "${FTARGET}"
+    linchpin -w . -p "${PINFILE}" -v destroy "${TARGET}"
 }
 trap clean_up EXIT SIGHUP SIGINT SIGTERM
 
 pushd docs/source/examples/workspace
-linchpin -w . -p "${PINFILE}" -v up "${DTARGET}" "${FTARGET}"
+linchpin -w . -p "${PINFILE}" -v up "${TARGET}"
diff --git a/linchpin/provision/library/bkr_server.py b/linchpin/provision/library/bkr_server.py
@@ -137,7 +137,8 @@ def provision(self, *args, **kwargs):
                     # all other filters are ignored if the hostname is forced,
                     # so the use of 'force' is mutually exclusive with the use
                     # of any other 'hostRequires' filters
-                    hostrequires_node.setAttribute('force', requirement['force'])
+                    hostrequires_node.setAttribute('force',
+                                                   requirement['force'])
                 elif 'rawxml' in requirement:
                     requirement_node = xml.dom.minidom.parseString(
                         requirement['rawxml']).documentElement